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

Comment and typing improvements

Browse Source 
To make the StatusNet::addPlugin() accept only arrays,
the lib/default.php had to be changed because all plugins
had 'null' as default value instead of an array.
This commit is contained in:
Mikael Nordfeldth 2013-11-18 20:43:00 +01:00
parent 06b068d43b
commit c942bdcb43
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/default.php
View File

@ -298,15 +298,15 @@ $default =
'StrictTransportSecurity' => null, 'StrictTransportSecurity' => null,
), ),
'default' => array( 'default' => array(
'Activity' => null, 'Activity' => array(),
'Bookmark' => null, 'Bookmark' => array(),
'ClientSideShorten' => null, 'ClientSideShorten' => array(),
'Event' => null, 'Event' => array(),
'OpenID' => null, 'OpenID' => array(),
'Poll' => null, 'Poll' => array(),
'QnA' => null, 'QnA' => array(),
'SearchSub' => null, 'SearchSub' => array(),
'TagSub' => null, 'TagSub' => array(),
), ),
'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories 'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
'server' => null, 'server' => null,

2
lib/framework.php
View File

@ -95,7 +95,7 @@ require_once(INSTALLDIR.'/lib/language.php');
require_once(INSTALLDIR.'/lib/event.php'); require_once(INSTALLDIR.'/lib/event.php');
require_once(INSTALLDIR.'/lib/plugin.php'); require_once(INSTALLDIR.'/lib/plugin.php');
function addPlugin($name, $attrs = null) function addPlugin($name, array $attrs=array())
{ {
return StatusNet::addPlugin($name, $attrs); return StatusNet::addPlugin($name, $attrs);
} }

10
lib/statusnet.php
View File

@ -44,7 +44,7 @@ class StatusNet
* *
* @throws ServerException if plugin can't be found * @throws ServerException if plugin can't be found
*/ */
public static function addPlugin($name, $attrs = null) public static function addPlugin($name, array $attrs=array())
{ {
$name = ucfirst($name); $name = ucfirst($name);
@ -78,11 +78,11 @@ class StatusNet
} }
} }
// Doesn't this $inst risk being garbage collected or something?
// TODO: put into a static array that makes sure $inst isn't lost.
$inst = new $pluginclass(); $inst = new $pluginclass();
if (!empty($attrs)) { foreach ($attrs as $aname => $avalue) {
foreach ($attrs as $aname => $avalue) { $inst->$aname = $avalue;
$inst->$aname = $avalue;
}
} }
// Record activated plugins for later display/config dump // Record activated plugins for later display/config dump

2
scripts/showplugins.php
View File

@ -24,7 +24,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
foreach (StatusNet::getActivePlugins() as $plugin=>$args) { foreach (StatusNet::getActivePlugins() as $plugin=>$args) {
echo "$plugin: "; echo "$plugin: ";
if ($args === null) { if (empty($args)) {
echo "(no args)\n"; echo "(no args)\n";
} else { } else {
foreach ($args as $arg => $val) { foreach ($args as $arg => $val) {