diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
| commit | d14415e37072dbe16077efd700aee5bd33707b54 (patch) | |
| tree | 062c3c190039ac9490f56598b0ee116de18c2480 /inc/parserutils.php | |
| parent | 2ed38036a53a489d2fcadc46ce601f8c876fca31 (diff) | |
| parent | 38479cbba628ee76a92ff5f3c974cfa8e6ce9e61 (diff) | |
| download | rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.gz rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.bz2 | |
Merge branch 'master' into subscription
* master: (175 commits)
some coding style improvements
added .idea project folder to gitignore
use correct setUp method and parent calls.
Correct German plugin manager translation (download != install)
correct return in sendDigest()
Fix case-insensitive match in ACL checking
GeSHi update to 1.0.8.11
ignore empty header on mail sending
remove empty BCC/CC mail headers
Galician language update
some welcome page changes
Combine subsequent calls to strtr into a single transformation
changed semicolon to colon in link to welcome page to make it less confusing
fixed wrong sidebar showing in namespaces when sidebar is disabled
Typo fix for TL;DR
removed a bunch of outdated and irrelevant networking acronyms
added another place to look for logo to make it more consistent (FS#2656)
French language update
Czech language update
compat js findPosX/y more closely mimic historical function
...
Conflicts:
inc/auth.php
inc/common.php
inc/subscription.php
lib/exe/indexer.php
Diffstat (limited to 'inc/parserutils.php')
| -rw-r--r-- | inc/parserutils.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/parserutils.php b/inc/parserutils.php index 3dbfc726f..1733fcf09 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -579,7 +579,7 @@ function p_get_parsermodes(){ $obj = null; foreach($pluginlist as $p){ /** @var DokuWiki_Syntax_Plugin $obj */ - if(!$obj =& plugin_load('syntax',$p)) continue; //attempt to load plugin into $obj + if(!$obj = plugin_load('syntax',$p)) continue; //attempt to load plugin into $obj $PARSER_MODES[$obj->getType()][] = "plugin_$p"; //register mode type //add to modes $modes[] = array( |