summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-14 11:15:48 +0200
committerBrion Vibber <brion@pobox.com>2010-04-14 11:15:48 +0200
commitf789928942c5753d1109ef9609449e79564fda4e (patch)
treeedb5fbee620ecb753421f3536d94d70b0c256379 /lib
parent89f28c7a0f77b5e3debcf9ec4ce6e020b3f0f12b (diff)
parent3da50c19dfff7645dc46f1b836ebf4ecda726129 (diff)
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/statusnet.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/statusnet.php b/lib/statusnet.php
index eba9ab9b8..2aa73486e 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -31,6 +31,7 @@ class StatusNet
{
protected static $have_config;
protected static $is_api;
+ protected static $plugins = array();
/**
* Configure and instantiate a plugin into the current configuration.
@@ -74,10 +75,23 @@ class StatusNet
$inst->$aname = $avalue;
}
}
+
+ // Record activated plugins for later display/config dump
+ self::$plugins[] = array($name, $attrs);
+
return true;
}
/**
+ * Get a list of activated plugins in this process.
+ * @return array of (string $name, array $args) pairs
+ */
+ public static function getActivePlugins()
+ {
+ return self::$plugins;
+ }
+
+ /**
* Initialize, or re-initialize, StatusNet global configuration
* and plugins.
*
@@ -232,6 +246,7 @@ class StatusNet
global $_server, $_path, $config;
Event::clearHandlers();
+ self::$plugins = array();
// try to figure out where we are. $server and $path
// can be set by including module, else we guess based