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

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

This commit is contained in:
Evan Prodromou 2009-10-29 14:34:33 -04:00
parent e88dd2d087 201cbb56b6
commit c911c66fe1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/othersettings.php
View File

@ -103,7 +103,7 @@ class OthersettingsAction extends AccountSettingsAction
foreach($_shorteners as $name=>$value)
{
$services[$name]=$name;
if($value['info']['freeService']){
if(!empty($value['info']['freeService'])){
// I18N
$services[$name].=' (free service)';
}

2
plugins/Facebook/FacebookPlugin.php
View File

@ -58,7 +58,7 @@ class FacebookPlugin extends Plugin
* @return boolean hook return
*/
function onRouterInitialized(&$m)
function onRouterInitialized($m)
{
// Facebook App stuff

2
plugins/OpenID/OpenIDPlugin.php
View File

@ -62,7 +62,7 @@ class OpenIDPlugin extends Plugin
* @return boolean hook return
*/
function onRouterInitialized(&$m)
function onRouterInitialized($m)
{
$m->connect('main/openid', array('action' => 'openidlogin'));
$m->connect('settings/openid', array('action' => 'openidsettings'));

2
plugins/TemplatePlugin.php
View File

@ -32,7 +32,7 @@ class TemplatePlugin extends Plugin {
// capture the RouterInitialized event
// and connect a new API method
// for updating the template
function onRouterInitialized( &$m ) {
function onRouterInitialized( $m ) {
$m->connect( 'template/update', array(
'action' => 'template',
));

4
plugins/TwitterBridge/TwitterBridgePlugin.php
View File

@ -60,12 +60,12 @@ class TwitterBridgePlugin extends Plugin
*
* Hook for RouterInitialized event.
*
* @param Net_URL_Mapper &$m path-to-action mapper
* @param Net_URL_Mapper $m path-to-action mapper
*
* @return boolean hook return
*/
function onRouterInitialized(&$m)
function onRouterInitialized($m)
{
$m->connect('twitter/authorization',
array('action' => 'twitterauthorization'));