Merge commit 'refs/merge-requests/1723' of git://gitorious.org/statusnet/mainline into 0.8.x

3 files changed, 4 insertions, 4 deletions

diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index be15efc47..517f12789 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -106,7 +106,7 @@ class GroupSearchResults extends GroupList
 
     function __construct($user_group, $terms, $action)
     {
-        parent::__construct($user_group, $terms, $action);
+        parent::__construct($user_group, null, $action);
         $this->terms = array_map('preg_quote',
                                  array_map('htmlspecialchars', $terms));
         $this->pattern = '/('.implode('|',$terms).')/i';
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 41887a68f..360dff27c 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -454,7 +454,7 @@ class TwitapistatusesAction extends TwitterapiAction
     function friends($args, $apidata)
     {
         parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
+        $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
         return $this->subscriptions($apidata, 'subscribed', 'subscriber', false, $includeStatuses);
     }
 
@@ -467,7 +467,7 @@ class TwitapistatusesAction extends TwitterapiAction
     function followers($args, $apidata)
     {
         parent::handle($args);
-        $includeStatuses=! (boolean) $args['lite'];
+        $includeStatuses= !(array_key_exists('lite', $args) and $args['lite']);
         return $this->subscriptions($apidata, 'subscriber', 'subscribed', false, $includeStatuses);
     }
 
diff --git a/lib/util.php b/lib/util.php
index a069ccf7b..9b299cb14 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -981,7 +981,7 @@ function common_set_returnto($url)
 function common_get_returnto()
 {
     common_ensure_session();
-    return $_SESSION['returnto'];
+    return (array_key_exists('returnto', $_SESSION)) ? $_SESSION['returnto'] : null;
 }
 
 function common_timestamp()