GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Craig Andrews 2009-10-11 13:21:18 -04:00
parent 6f12ed5f91 838c13063a
commit 006cfc528e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/groupsearch.php
View File

@ -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';

4
actions/twitapistatuses.php
View File

@ -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);
}

2
lib/util.php
View File

@ -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()