diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-02 21:00:08 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-02 21:00:08 +0000 |
| commit | f327a5f0a9ef72e6dd79d9d200f81c330aa4903c (patch) | |
| tree | 2d2a398218964e3bee0876385f9c8786a3baf8de /inc/pluginutils.php | |
| parent | 446b5b5934799f1f906ea8903b1e96c981f1c1b2 (diff) | |
| parent | 709fd92548efedbd4b4e5693097165d1dff072e4 (diff) | |
| download | rpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.gz rpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.bz2 | |
Merge branch 'master' into FS#2388
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 */ |