diff options
| author | lisps <stummp@loewen.de> | 2014-03-19 08:07:16 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-03-19 08:07:16 +0100 |
| commit | e310313d794a3336d279ee09973508e794dbf08e (patch) | |
| tree | 7f90b51d344f7163c6fbb109f04ff22dea5ae129 /inc/pluginutils.php | |
| parent | cdb5e9613f7c4b1be4515715652aca451493d5d5 (diff) | |
| parent | 177ef92c4ddd38cb906dd7d5f0208c698048cd57 (diff) | |
| download | rpg-e310313d794a3336d279ee09973508e794dbf08e.tar.gz rpg-e310313d794a3336d279ee09973508e794dbf08e.tar.bz2 | |
Merge remote-tracking branch 'remotes/origin/master' into revisions_local
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 */ |