wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Zach Copley 2010-01-06 16:24:25 -08:00
commit 5d13126c88
19 changed files with 54 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Avatar.php
View File

@ -37,7 +37,7 @@ class Avatar extends Memcached_DataObject
} }
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Avatar', $kv); return Memcached_DataObject::pkeyGet('Avatar', $kv);
} }

2
classes/Config.php
View File

@ -120,7 +120,7 @@ class Config extends Memcached_DataObject
return $result; return $result;
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Config', $kv); return Memcached_DataObject::pkeyGet('Config', $kv);
} }

2
classes/Fave.php
View File

@ -32,7 +32,7 @@ class Fave extends Memcached_DataObject
return $fave; return $fave;
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Fave', $kv); return Memcached_DataObject::pkeyGet('Fave', $kv);
} }

2
classes/File_to_post.php
View File

@ -62,7 +62,7 @@ class File_to_post extends Memcached_DataObject
} }
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('File_to_post', $kv); return Memcached_DataObject::pkeyGet('File_to_post', $kv);
} }

2
classes/Group_block.php
View File

@ -40,7 +40,7 @@ class Group_block extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Group_block', $kv); return Memcached_DataObject::pkeyGet('Group_block', $kv);
} }

2
classes/Group_inbox.php
View File

@ -20,7 +20,7 @@ class Group_inbox extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Group_inbox', $kv); return Memcached_DataObject::pkeyGet('Group_inbox', $kv);
} }

2
classes/Group_member.php
View File

@ -21,7 +21,7 @@ class Group_member extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Group_member', $kv); return Memcached_DataObject::pkeyGet('Group_member', $kv);
} }

2
classes/Notice_inbox.php
View File

@ -101,7 +101,7 @@ class Notice_inbox extends Memcached_DataObject
return $ids; return $ids;
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Notice_inbox', $kv); return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
} }

2
classes/Notice_tag.php
View File

@ -96,7 +96,7 @@ class Notice_tag extends Memcached_DataObject
} }
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Notice_tag', $kv); return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
} }

2
classes/Profile_role.php
View File

@ -43,7 +43,7 @@ class Profile_role extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Profile_role', $kv); return Memcached_DataObject::pkeyGet('Profile_role', $kv);
} }

2
classes/Queue_item.php
View File

@ -55,7 +55,7 @@ class Queue_item extends Memcached_DataObject
return null; return null;
} }
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Queue_item', $kv); return Memcached_DataObject::pkeyGet('Queue_item', $kv);
} }

2
classes/Subscription.php
View File

@ -46,7 +46,7 @@ class Subscription extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('Subscription', $kv); return Memcached_DataObject::pkeyGet('Subscription', $kv);
} }

11
doc-src/sms
View File

@ -56,13 +56,4 @@ You can use the following commands with %%site.name%%.
* sub <nickname> - same as 'follow' * sub <nickname> - same as 'follow'
* unsub <nickname> - same as 'leave' * unsub <nickname> - same as 'leave'
* last <nickname> - same as 'get' * last <nickname> - same as 'get'
* on <nickname> - not yet implemented. * nudge <nickname> - remind a user to update.
* off <nickname> - not yet implemented.
* nudge <nickname> - not yet implemented.
* invite <phone number> - not yet implemented.
* track <word> - not yet implemented.
* untrack <word> - not yet implemented.
* track off - not yet implemented.
* untrack all - not yet implemented.
* tracks - not yet implemented.
* tracking - not yet implemented.

74
lib/command.php
View File

@ -742,42 +742,42 @@ class HelpCommand extends Command
function execute($channel) function execute($channel)
{ {
$channel->output($this->user, $channel->output($this->user,
_("Commands:\n". _("Commands:")."\n".
"on - turn on notifications\n". _("on - turn on notifications")."\n".
"off - turn off notifications\n". _("off - turn off notifications")."\n".
"help - show this help\n". _("help - show this help")."\n".
"follow <nickname> - subscribe to user\n". _("follow <nickname> - subscribe to user")."\n".
"groups - lists the groups you have joined\n". _("groups - lists the groups you have joined")."\n".
"subscriptions - list the people you follow\n". _("subscriptions - list the people you follow")."\n".
"subscribers - list the people that follow you\n". _("subscribers - list the people that follow you")."\n".
"leave <nickname> - unsubscribe from user\n". _("leave <nickname> - unsubscribe from user")."\n".
"d <nickname> <text> - direct message to user\n". _("d <nickname> <text> - direct message to user")."\n".
"get <nickname> - get last notice from user\n". _("get <nickname> - get last notice from user")."\n".
"whois <nickname> - get profile info on user\n". _("whois <nickname> - get profile info on user")."\n".
"fav <nickname> - add user's last notice as a 'fave'\n". _("fav <nickname> - add user's last notice as a 'fave'")."\n".
"fav #<notice_id> - add notice with the given id as a 'fave'\n". _("fav #<notice_id> - add notice with the given id as a 'fave'")."\n".
"repeat #<notice_id> - repeat a notice with a given id\n". _("repeat #<notice_id> - repeat a notice with a given id")."\n".
"repeat <nickname> - repeat the last notice from user\n". _("repeat <nickname> - repeat the last notice from user")."\n".
"reply #<notice_id> - reply to notice with a given id\n". _("reply #<notice_id> - reply to notice with a given id")."\n".
"reply <nickname> - reply to the last notice from user\n". _("reply <nickname> - reply to the last notice from user")."\n".
"join <group> - join group\n". _("join <group> - join group")."\n".
"login - Get a link to login to the web interface\n". #_("login - Get a link to login to the web interface")."\n".
"drop <group> - leave group\n". _("drop <group> - leave group")."\n".
"stats - get your stats\n". _("stats - get your stats")."\n".
"stop - same as 'off'\n". _("stop - same as 'off'")."\n".
"quit - same as 'off'\n". _("quit - same as 'off'")."\n".
"sub <nickname> - same as 'follow'\n". _("sub <nickname> - same as 'follow'")."\n".
"unsub <nickname> - same as 'leave'\n". _("unsub <nickname> - same as 'leave'")."\n".
"last <nickname> - same as 'get'\n". _("last <nickname> - same as 'get'")."\n".
"on <nickname> - not yet implemented.\n". #_("on <nickname> - not yet implemented.")."\n".
"off <nickname> - not yet implemented.\n". #_("off <nickname> - not yet implemented.")."\n".
"nudge <nickname> - remind a user to update.\n". _("nudge <nickname> - remind a user to update.")."\n");
"invite <phone number> - not yet implemented.\n". #_("invite <phone number> - not yet implemented.")."\n".
"track <word> - not yet implemented.\n". #_("track <word> - not yet implemented.")."\n".
"untrack <word> - not yet implemented.\n". #_("untrack <word> - not yet implemented.")."\n".
"track off - not yet implemented.\n". #_("track off - not yet implemented.")."\n".
"untrack all - not yet implemented.\n". #_("untrack all - not yet implemented.")."\n".
"tracks - not yet implemented.\n". #_("tracks - not yet implemented.")."\n".
"tracking - not yet implemented.\n")); #_("tracking - not yet implemented.")."\n"
} }
} }

2
lib/htmloutputter.php
View File

@ -352,7 +352,7 @@ class HTMLOutputter extends XMLOutputter
{ {
if(Event::handle('StartScriptElement', array($this,&$src,&$type))) { if(Event::handle('StartScriptElement', array($this,&$src,&$type))) {
$url = parse_url($src); $url = parse_url($src);
if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment']))
{ {
$src = common_path($src) . '?version=' . STATUSNET_VERSION; $src = common_path($src) . '?version=' . STATUSNET_VERSION;
} }

1
plugins/LdapAuthorization/LdapAuthorizationPlugin.php
View File

@ -52,7 +52,6 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
public $attributes = array(); public $attributes = array();
function onInitializePlugin(){ function onInitializePlugin(){
parent::onInitializePlugin();
if(!isset($this->host)){ if(!isset($this->host)){
throw new Exception("must specify a host"); throw new Exception("must specify a host");
} }

2
plugins/Minify/MinifyPlugin.php
View File

@ -84,7 +84,7 @@ class MinifyPlugin extends Plugin
function onStartScriptElement($action,&$src,&$type) { function onStartScriptElement($action,&$src,&$type) {
$url = parse_url($src); $url = parse_url($src);
if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment']))
{ {
$src = $this->minifyUrl($src); $src = $this->minifyUrl($src);
} }

2
plugins/OpenID/User_openid_trustroot.php
View File

@ -22,7 +22,7 @@ class User_openid_trustroot extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv); return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
} }

2
plugins/UserFlag/User_flag_profile.php
View File

@ -97,7 +97,7 @@ class User_flag_profile extends Memcached_DataObject
* @return User_flag_profile found object or null * @return User_flag_profile found object or null
*/ */
function &pkeyGet($kv) function pkeyGet($kv)
{ {
return Memcached_DataObject::pkeyGet('User_flag_profile', $kv); return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
} }