diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-10 23:57:01 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-10 23:57:01 +0100 |
| commit | f97db66038968542deefbf9817a3dd49b67b1904 (patch) | |
| tree | 6995f5bfd7017999a743c327474afc7b9514d94f /inc/parser/renderer.php | |
| parent | 6384941886832589f7bb3c13bc18115499cf9369 (diff) | |
| parent | 9f12fc1cc9e916c3172a0cf8953ed70fd18f2ec1 (diff) | |
| download | rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.gz rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into userlink
Conflicts:
inc/parser/renderer.php
inc/template.php
Diffstat (limited to 'inc/parser/renderer.php')
| -rw-r--r-- | inc/parser/renderer.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index 01a1fbfec..0c3c56c56 100644 --- a/inc/parser/renderer.php +++ b/inc/parser/renderer.php @@ -6,8 +6,6 @@ * @author Andreas Gohr <andi@splitbrain.org> */ if(!defined('DOKU_INC')) die('meh.'); -require_once DOKU_INC . 'inc/plugin.php'; -require_once DOKU_INC . 'inc/pluginutils.php'; /** * An empty renderer, produces no output @@ -277,7 +275,7 @@ class Doku_Renderer extends DokuWiki_Plugin { global $conf; //if there is a hash we use the ancor name only - list($name, $hash) = explode('#', $name, 2); + @list($name, $hash) = explode('#', $name, 2); if($hash) return $hash; if($conf['useslash']) { @@ -303,7 +301,7 @@ class Doku_Renderer extends DokuWiki_Plugin { } //split into hash and url part - list($reference, $hash) = explode('#', $reference, 2); + @list($reference, $hash) = explode('#', $reference, 2); //replace placeholder if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#', $url)) { |