Merge branch 'testing' into 0.9.x

Conflicts: actions/apioauthauthorize.php
2010-01-31 15:27:58 -05:00
parent bd52783025 81087e45c5
commit 779204b194
47 changed files with 2864 additions and 350 deletions
--- a/lib/api.php
+++ b/lib/api.php
@@ -299,7 +299,7 @@ class ApiAction extends Action
            }
        }

-        if ($include_user) {
+        if ($include_user && $profile) {
            # Don't get notice (recursive!)
            $twitter_user = $this->twitterUserArray($profile, false);
            $twitter_status['user'] = $twitter_user;