diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-04-18 19:21:15 -0400 |
commit | 39392e03a71d94d6b984033b994b417edfc2d8d6 (patch) | |
tree | cb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /lib/statusnet.php | |
parent | 727ea5a5163249eb40fa0c4b2c63054fc997473b (diff) | |
parent | 23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
Diffstat (limited to 'lib/statusnet.php')
-rw-r--r-- | lib/statusnet.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/statusnet.php b/lib/statusnet.php index 98f25c8a0..ac5d10134 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. * @@ -237,6 +251,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 |