Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

2 files changed, 2 insertions, 2 deletions

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index efc8215cd..0c109ab53 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -472,7 +472,7 @@ class TwittersettingsAction extends ConnectSettingsAction
 
     function verifyCredentials($screen_name, $password)
     {
-        $uri = 'http://twitter.com/account/verifyCredentials.json';
+        $uri = 'http://twitter.com/account/verify_credentials.json';
 
         $data = get_twitter_data($uri, $screen_name, $password);
 
diff --git a/lib/twitter.php b/lib/twitter.php
index 5eb15005a..197298549 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -42,7 +42,7 @@ function get_twitter_data($uri, $screen_name, $password)
     $errmsg = curl_error($ch);
 
     if ($errmsg) {
-        common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $twit_user.",
+        common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $screen_name.",
             __FILE__);
     }