Merge branch 'master' into tablethead

1 files changed, 12 insertions, 8 deletions

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index ee0b2344d..800fa3a95 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
@@ -59,9 +57,15 @@ class Doku_Renderer extends DokuWiki_Plugin {
         return false;
     }
 
-
-    //handle plugin rendering
-    function plugin($name,$data){
+    /**
+     * handle plugin rendering
+     *
+     * @param string $name Plugin name
+     * @param mixed  $data custom data set by handler
+     * @param string $state matched state if any
+     * @param string $match raw matched syntax
+     */
+    function plugin($name,$data,$state='',$match=''){
         $plugin = plugin_load('syntax',$name);
         if($plugin != null){
             $plugin->render($this->getFormat(),$this,$data);
@@ -274,8 +278,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']){
@@ -301,7 +305,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)){