GContact renamed

Rename and update references for GlobalContact

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index a59d761981c1873ff5bd04b21165086feddc313d..4873d73df4041d32b517e699a5663bc65d83310a 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -9,7 +9,7 @@
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GContact;
+use Friendica\Model\GlobalContact;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -968,7 +968,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
-       GContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+       GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
                        "photo" => $contact->image->url, "name" => $contact->displayName,  "hide" => true,
                        "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
                        "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index bc0f314377a6a345f2a337b1c7bb71ef0d1ea8dc..5f3e83ca1c90667298d06ae779a13f9f0e67a3e8 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -48,7 +48,7 @@ require_once 'include/enotify.php';
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Model\GContact;
+use Friendica\Model\GlobalContact;
 
 class StatusNetOAuth extends TwitterOAuth {
     function get_maxlength() {
@@ -929,7 +929,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
        if ($contact->statusnet_profile_url == "")
                return(-1);
 
-       GContact::update(array("url" => $contact->statusnet_profile_url,
+       GlobalContact::update(array("url" => $contact->statusnet_profile_url,
                        "network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
                        "name" => $contact->name, "nick" => $contact->screen_name,
                        "location" => $contact->location, "about" => $contact->description,

diff --git a/twitter/twitter.php b/twitter/twitter.php
index a4017562b84ff2f073c593a9a6e5af54fa8c664c..f8c6aec9a7e6c213ed45572a28847f62507d40c4 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -63,7 +63,7 @@
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GContact;
+use Friendica\Model\GlobalContact;
 
 require_once 'include/enotify.php';
 
@@ -956,7 +956,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
        $avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-       GContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
+       GlobalContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
                        "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
                        "name" => $contact->name, "nick" => $contact->screen_name,
                        "location" => $contact->location, "about" => $contact->description,