diff options
author | Evan Prodromou <evan@status.net> | 2010-01-31 15:27:58 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-31 15:27:58 -0500 |
commit | 779204b194447397d0770d96e291d9491fd731b9 (patch) | |
tree | d0bfe36cc2b743fce8507e8cf6851467ccec8789 /lib/api.php | |
parent | bd5278302574ae3af87f09e0d8191c95ab93582a (diff) | |
parent | 81087e45c5b797028e90181459e4c673cd7be278 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
actions/apioauthauthorize.php
Diffstat (limited to 'lib/api.php')
-rw-r--r-- | lib/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api.php b/lib/api.php index 825262b4c..987f2cc1b 100644 --- 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; |