Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

[quix0rs-gnu-social.git] / actions / twitapiusers.php

diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 2894b7486dd31372fe63ca76ca41ed99821922b4..1542cfb33e3d064130093272e014ac4fa6262d81 100644 (file)
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -82,8 +82,8 @@ class TwitapiusersAction extends TwitterapiAction
                $twitter_user['profile_text_color'] = '';
                $twitter_user['profile_link_color'] = '';
                $twitter_user['profile_sidebar_fill_color'] = '';
-        $twitter_user['profile_sidebar_border_color'] = '';
-        $twitter_user['profile_background_tile'] = 'false';
+               $twitter_user['profile_sidebar_border_color'] = '';
+               $twitter_user['profile_background_tile'] = false;
 
                $faves = DB_DataObject::factory('fave');
                $faves->user_id = $user->id;
@@ -103,24 +103,16 @@ class TwitapiusersAction extends TwitterapiAction
 
                if (isset($apidata['user'])) {
 
-                       if ($apidata['user']->isSubscribed($profile)) {
-                               $twitter_user['following'] = 'true';
-                       } else {
-                               $twitter_user['following'] = 'false';
-                       }
+                       $twitter_user['following'] = $apidata['user']->isSubscribed($profile);
             
-            // Notifications on?
-                   $sub = Subscription::pkeyGet(array('subscriber' =>
-                       $apidata['user']->id, 'subscribed' => $profile->id));
+                       // Notifications on?
+                       $sub = Subscription::pkeyGet(array('subscriber' =>
+                               $apidata['user']->id, 'subscribed' => $profile->id));
             
-            if ($sub) {
-                if ($sub->jabber || $sub->sms) {
-                    $twitter_user['notifications'] = 'true';
-                } else {
-                    $twitter_user['notifications'] = 'false';
-                }
-            }
-        }
+                       if ($sub) {
+                               $twitter_user['notifications'] = ($sub->jabber || $sub->sms);
+                       }
+               }
         
                if ($apidata['content-type'] == 'xml') {
                        $this->init_document('xml');