From 9aa0e6c6087e616511fc95d1650ca9b608edece8 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny0838@pchome.com.tw>
Date: Wed, 26 Jan 2011 08:16:45 +0800
Subject: Like others, there's no need to define $sectionedits as private, and
 it prevents plugins that ought to handle headers from working and require a
 lot of ugly workarounds (such as header2).

If there's a concern, "protected" may be another choice.
---
 inc/parser/xhtml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/parser')

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 9405d9420..b502b4f6b 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 08162f005f3ced0555de590dc1a53155af99d998 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny0838@pchome.com.tw>
Date: Wed, 26 Jan 2011 08:25:21 +0800
Subject: Fixes an issue of metadata missing on links with empty altname.
 FS#2144

---
 inc/parser/metadata.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index fc2c8cbc5..bd396e2b4 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -455,16 +455,16 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     global $conf;
 
     $isImage = false;
-    if (is_null($title)){
+    if (is_array($title)){
+      if($title['title']) return '['.$title['title'].']';
+    } else if (is_null($title) || trim($title)==''){
       if (useHeading('content') && $id){
         $heading = p_get_first_heading($id,false);
         if ($heading) return $heading;
       }
       return $default;
-    } else if (is_string($title)){
+    } else {
       return $title;
-    } else if (is_array($title)){
-      if($title['title']) return '['.$title['title'].']';
     }
   }
 
-- 
cgit v1.2.3