From 2ada8709d3a0cea872f117823b244b400fac5f87 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 25 Feb 2014 20:32:56 +0000
Subject: add renderers to autolader

---
 inc/parser/code.php         | 1 -
 inc/parser/metadata.php     | 2 --
 inc/parser/renderer.php     | 1 -
 inc/parser/xhtml.php        | 3 ---
 inc/parser/xhtmlsummary.php | 1 -
 5 files changed, 8 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/code.php b/inc/parser/code.php
index 0b8e3ee02..d77ffd1aa 100644
--- a/inc/parser/code.php
+++ b/inc/parser/code.php
@@ -5,7 +5,6 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 if(!defined('DOKU_INC')) die('meh.');
-require_once DOKU_INC . 'inc/parser/renderer.php';
 
 class Doku_Renderer_code extends Doku_Renderer {
     var $_codeblock=0;
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 8ba159d62..73bae190f 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -16,8 +16,6 @@ if ( !defined('DOKU_TAB') ) {
     define ('DOKU_TAB',"\t");
 }
 
-require_once DOKU_INC . 'inc/parser/renderer.php';
-
 /**
  * The Renderer
  */
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index e3401fd48..6b6a1770b 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -6,7 +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';
 
 /**
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 315b4d640..184e62fe3 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -17,9 +17,6 @@ if ( !defined('DOKU_TAB') ) {
     define ('DOKU_TAB',"\t");
 }
 
-require_once DOKU_INC . 'inc/parser/renderer.php';
-require_once DOKU_INC . 'inc/html.php';
-
 /**
  * The Renderer
  */
diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php
index 95f86cbef..867b71f6a 100644
--- a/inc/parser/xhtmlsummary.php
+++ b/inc/parser/xhtmlsummary.php
@@ -1,6 +1,5 @@
 <?php
 if(!defined('DOKU_INC')) die('meh.');
-require_once DOKU_INC . 'inc/parser/xhtml.php';
 
 /**
  * The summary XHTML form selects either up to the first two paragraphs
-- 
cgit v1.2.3


From 489dcad6f038c54dda1f29c0887fa43f5b3f7fcb Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 28 Feb 2014 16:56:29 +0000
Subject: remove require handled by autoloader

---
 inc/parser/renderer.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'inc/parser')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 6b6a1770b..1f9ad00a2 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -6,7 +6,6 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 if(!defined('DOKU_INC')) die('meh.');
-require_once DOKU_INC . 'inc/pluginutils.php';
 
 /**
  * An empty renderer, produces no output
-- 
cgit v1.2.3


From 6d2af55dde922ac10a288b4195b1bf338e7bc5a9 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 5 Mar 2014 22:01:20 +0000
Subject: suppress errors where list() may not fill all vars

---
 inc/parser/metadata.php | 2 +-
 inc/parser/renderer.php | 6 +++---
 inc/parser/xhtml.php    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 73bae190f..82a268fd6 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -299,7 +299,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
 
         // first resolve and clean up the $id
         resolve_pageid(getNS($ID), $id, $exists);
-        list($page, $hash) = explode('#', $id, 2);
+        @list($page, $hash) = explode('#', $id, 2);
 
         // set metadata
         $this->meta['relation']['references'][$page] = $exists;
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 1f9ad00a2..e748c36d8 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -274,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']){
@@ -301,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)){
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 184e62fe3..4966f103a 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -606,7 +606,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
 
         //keep hash anchor
-        list($id,$hash) = explode('#',$id,2);
+        @list($id,$hash) = explode('#',$id,2);
         if(!empty($hash)) $hash = $this->_headerToLink($hash);
 
         //prepare for formating
-- 
cgit v1.2.3