summaryrefslogtreecommitdiff
path: root/inc/plugin.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-01-25 11:09:54 +0100
committerAndreas Gohr <andi@splitbrain.org>2013-01-25 11:09:54 +0100
commit33e75ca2f63b10ae1c7c7e9891ae857ce80d1811 (patch)
tree481e679c75e8eb5a58bd3f71a48f26ec87d86db4 /inc/plugin.php
parent3295f40a380553bb3f7f3018cee2e4462e0be417 (diff)
parenta24fc53e2623640cf5e2d00de741c1b67c9bb294 (diff)
downloadrpg-33e75ca2f63b10ae1c7c7e9891ae857ce80d1811.tar.gz
rpg-33e75ca2f63b10ae1c7c7e9891ae857ce80d1811.tar.bz2
Merge branch 'confmanager' into future
* confmanager: added failing test for array type started to add some unit tests to config manager Revert "config manager: let PHP parse the config file" added 'array' type for config manager config manager: let PHP parse the config file config manager: removed dead/commented code added PCRE UTF-8 checks to do=check FS#2636 avoid multiple paralell update checks fix regression bug in HTTPClient FS#2621 changed PAGEUTILS_ID_HIDEPAGE to has BEFORE/AFTER added event PAGEUTILS_ID_HIDEPAGE added test for isHiddenPage() add index file similar to fileicons to show active smileys fix E_STRICT errors FS#2427
Diffstat (limited to 'inc/plugin.php')
-rw-r--r--inc/plugin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/plugin.php b/inc/plugin.php
index 2b4111fe1..6ffc1ddcb 100644
--- a/inc/plugin.php
+++ b/inc/plugin.php
@@ -200,7 +200,7 @@ class DokuWiki_Plugin {
*/
function loadHelper($name, $msg){
if (!plugin_isdisabled($name)){
- $obj =& plugin_load('helper',$name);
+ $obj = plugin_load('helper',$name);
}else{
$obj = null;
}