From fb838798781d6a7a488c82a93c69853bb5cb08d8 Mon Sep 17 00:00:00 2001
From: Danny <danny0838@gmail.com>
Date: Sat, 17 Dec 2011 13:17:44 +0800
Subject: Rewark for missing commit 9aa0e6c6087e616511fc95d1650ca9b608edece8

---
 inc/parser/xhtml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/parser/xhtml.php')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index ea1756803..a9ee33e9d 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -29,7 +29,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     var $doc = '';        // will contain the whole document
     var $toc = array();   // will contain the Table of Contents
 
-    private $sectionedits = array(); // A stack of section edit data
+    var $sectionedits = array(); // A stack of section edit data
 
     var $headers = array();
     var $footnotes = array();
-- 
cgit v1.2.3


From df959702e1899c968dc953855f36b9788afa12d3 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Tue, 20 Dec 2011 11:10:20 +0100
Subject: Revert 4a24b459, thus fixing FETCH_MEDIA_STATUS for missing files
 (FS#2405)

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

(limited to 'inc/parser/xhtml.php')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index ea1756803..bfa22d066 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -807,7 +807,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         //markup non existing files
         if (!$exists) {
             $link['class'] .= ' wikilink2';
-            $link['url'] = media_managerURL(array('tab_details' => 'view', 'image' => $src, 'ns' => getNS($src)), '&');
         }
 
         //output formatted
-- 
cgit v1.2.3


From c4dda6afdfe780288bffaebcde485b32b91731d6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 31 Jan 2012 00:21:07 +0000
Subject: fixed .curid to always highlight the current ID of the main/viewed
 page

---
 inc/parser/xhtml.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc/parser/xhtml.php')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index bfa22d066..8d1eb24c1 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -566,6 +566,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     function internallink($id, $name = NULL, $search=NULL,$returnonly=false,$linktype='content') {
         global $conf;
         global $ID;
+        global $INFO;
 
         $params = '';
         $parts = explode('?', $id, 2);
@@ -610,7 +611,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['pre']    = '';
         $link['suf']    = '';
         // highlight link to current page
-        if ($id == $ID) {
+        if ($id == $INFO['id']) {
             $link['pre']    = '<span class="curid">';
             $link['suf']    = '</span>';
         }
-- 
cgit v1.2.3