diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 17:09:29 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 17:09:29 +0100 |
| commit | 3275c5d6feb683bf4151f7d4867b10431b254d1e (patch) | |
| tree | 4fd5e9ecf9165eb1b7cddd3d2bb1ae1330db92ab /inc/parser/renderer.php | |
| parent | 8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (diff) | |
| parent | 1359eacbdbff842b241a85ea274a00982fec9267 (diff) | |
| download | rpg-3275c5d6feb683bf4151f7d4867b10431b254d1e.tar.gz rpg-3275c5d6feb683bf4151f7d4867b10431b254d1e.tar.bz2 | |
Merge branch 'master' into diff_navigation
* master: (103 commits)
Add a basic test case for the cache
Events: Trigger a warning if the default action is not callable
Fix caching (make the event callback public again)
translation update
translation update
translation update
translation update
translation update
translation update
translation update
avoid HTTP image screenshot urls. closes #595
translation update
Extension manager: Fix cache extension to be .repo
adjusted the office type color again
another instance of empty() where an array key might not exist
remove placeholder van denied.txt
updated file icons once more
removed 'not logged in' text, loginform is shown already
Revert "added stripped bit to language file"
fixed index file
...
Conflicts:
inc/html.php
Diffstat (limited to 'inc/parser/renderer.php')
| -rw-r--r-- | inc/parser/renderer.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php index e3401fd48..e748c36d8 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 @@ -276,8 +274,8 @@ class Doku_Renderer extends DokuWiki_Plugin { function _simpleTitle($name){ global $conf; - //if there is a hash we use the ancor name only - list($name,$hash) = explode('#',$name,2); + //if there is a hash we use the anchor name only + @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)){ |