diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:39:53 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-04 21:39:53 +0100 |
| commit | 603c1a1e6dfa9f1bc6759843283a8a7995c613f8 (patch) | |
| tree | 61349b0905bf69e2370f150d6e32901bad1aa25f /inc/pluginutils.php | |
| parent | b35d34217e073f330111fea5812fa4d88680a4ef (diff) | |
| parent | 4b142187c1238555a14d79ff6e054a678ce828f3 (diff) | |
| download | rpg-603c1a1e6dfa9f1bc6759843283a8a7995c613f8.tar.gz rpg-603c1a1e6dfa9f1bc6759843283a8a7995c613f8.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into FS#2124deniedtext
Conflicts:
inc/lang/bn/lang.php
inc/lang/fr/denied.txt
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 */ |