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

Don't allow double plugin loading

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-11-18 20:04:00 +01:00
parent dfd83bd898
commit 06b068d43b
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cache.php
View File

@ -125,14 +125,12 @@ class Cache
if (empty($prefix)) {
$plugins = StatusNet::getActivePlugins();
$names = array();
$names = array();
foreach ($plugins as $plugin) {
$names[] = $plugin[0];
foreach (StatusNet::getActivePlugins() as $plugin=>$attrs) {
$names[] = $plugin;
}
$names = array_unique($names);
asort($names);
// Unique enough.

24
lib/statusnet.php
View File

@ -47,6 +47,14 @@ class StatusNet
public static function addPlugin($name, $attrs = null)
{
$name = ucfirst($name);
if (isset(self::$plugins[$name])) {
// We have already loaded this plugin. Don't try to
// do it again with (possibly) different values.
// Försten till kvarn får mala.
return true;
}
$pluginclass = "{$name}Plugin";
if (!class_exists($pluginclass)) {
@ -78,7 +86,7 @@ class StatusNet
}
// Record activated plugins for later display/config dump
self::$plugins[] = array($name, $attrs);
self::$plugins[$name] = $attrs;
return true;
}
@ -181,9 +189,13 @@ class StatusNet
*/
protected static function initPlugins()
{
// User config may have already added some of these plugins, with
// maybe configured parameters. The self::addPlugin function will
// ignore the new call if it has already been instantiated.
// Load core plugins
foreach (common_config('plugins', 'core') as $name => $params) {
call_user_func('addPlugin', $name, $params);
call_user_func('self::addPlugin', $name, $params);
}
// Load default plugins
@ -194,17 +206,17 @@ class StatusNet
}
if (is_null($params)) {
addPlugin($name);
self::addPlugin($name);
} else if (is_array($params)) {
if (count($params) == 0) {
addPlugin($name);
self::addPlugin($name);
} else {
$keys = array_keys($params);
if (is_string($keys[0])) {
addPlugin($name, $params);
self::addPlugin($name, $params);
} else {
foreach ($params as $paramset) {
addPlugin($name, $paramset);
self::addPlugin($name, $paramset);
}
}
}

3
scripts/showplugins.php
View File

@ -22,8 +22,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
require_once INSTALLDIR.'/scripts/commandline.inc';
foreach (StatusNet::getActivePlugins() as $data) {
list($plugin, $args) = $data;
foreach (StatusNet::getActivePlugins() as $plugin=>$args) {
echo "$plugin: ";
if ($args === null) {
echo "(no args)\n";