Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / TwitterBridge / daemons / synctwitterfriends.php

diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index 6a155b3012593d7cdcf5bc8ddee171022e40b120..df7da0943d1d68d102a2ad4a431e7f173ffcf71c 100755 (executable)
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -126,7 +126,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
 
         $conn->disconnect();
 
-        // XXX: Could not find a less brutal way to blow
+        // XXX: Couldn't find a less brutal way to blow
         // away a cached connection
 
         global $_DB_DATAOBJECT;
@@ -188,7 +188,7 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
 
             if (empty($more_friends)) {
                 common_log(LOG_WARNING, $this->name() .
-                           " - Could not retrieve page $i " .
+                           " - Couldn't retrieve page $i " .
                            "of Twitter user $flink->foreign_id friends.");
                 continue;
             } else {
@@ -221,12 +221,12 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
             // Twitter friend
 
             if (!save_twitter_user($friend_id, $friend_name)) {
-                common_log(LOG_WARNING, $this-name() .
-                           " - Could not save $screen_name's friend, $friend_name.");
+                common_log(LOG_WARNING, $this->name() .
+                           " - Couldn't save $screen_name's friend, $friend_name.");
                 continue;
             }
 
-            // Check to see if there is a related local user
+            // Check to see if there's a related local user
 
             $friend_flink = Foreign_link::getByForeignID($friend_id,
                                                          TWITTER_SERVICE);