diff options
| author | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
| commit | 43a2e077a27740ebb0f0bc49e4a3d288c8811d78 (patch) | |
| tree | e22f94855951702e622d4c40ac44f3031b3d5819 /inc/pluginutils.php | |
| parent | c6af9e94ed5d7f7713359faac18543db9a9aee48 (diff) | |
| parent | 75930869ddcb31470ea7617eddfb882de02645df (diff) | |
| download | rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.gz rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/pluginutils.php')
| -rw-r--r-- | inc/pluginutils.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/pluginutils.php b/inc/pluginutils.php index 894bbefb6..911c4e5c0 100644 --- a/inc/pluginutils.php +++ b/inc/pluginutils.php @@ -37,7 +37,7 @@ function plugin_list($type='',$all=false) { * @param $name string name of the plugin to load * @param $new bool true to return a new instance of the plugin, false to use an already loaded instance * @param $disabled bool true to load even disabled plugins - * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|null the plugin object or null on failure + * @return DokuWiki_Plugin|null the plugin object or null on failure */ function plugin_load($type,$name,$new=false,$disabled=false) { /** @var $plugin_controller Doku_Plugin_Controller */ |