From e3776c06c37cc197709dac60892604dfea894ac2 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 29 Nov 2010 01:34:36 +0100
Subject: Remove enc=utf-8 in VIM modeline as it is not allowed in VIM 7.3

As of VIM 7.3 it is no longer possible to specify the encoding in the
modeline. This gives an error message whenever such a file is opened,
thus this commit removes the enc setting from the modeline.
---
 inc/parser/metadata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index f635ea1d5..263745593 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -479,4 +479,4 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 }
 
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From a8e721331b457d168309bfdfa062d0889997abd6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 22 Dec 2010 14:19:52 +0100
Subject: store the creator's login name in metadata FS#1397

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

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

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 263745593..5617a0c86 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -45,6 +45,9 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     if(!$this->persistent['date']['created']){
         $this->persistent['date']['created'] = filectime(wikiFN($ID));
     }
+    if(!isset($this->persistent['user'])){
+        $this->persistent['user'] = '';
+    }
     if(!isset($this->persistent['creator'])){
         $this->persistent['creator'] = '';
     }
-- 
cgit v1.2.3


From 682a7e10474024fe1dc045e30d2fafa4279d7059 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 22 Dec 2010 14:51:55 +0100
Subject: skip empty image title from abstract

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

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

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 5617a0c86..fc2c8cbc5 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -464,7 +464,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     } else if (is_string($title)){
       return $title;
     } else if (is_array($title)){
-      return '['.$title['title'].']';
+      if($title['title']) return '['.$title['title'].']';
     }
   }
 
-- 
cgit v1.2.3


From b17e20ac9cca30b612968d02f06fa9c5df5c01f0 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 6 Feb 2011 18:54:38 +0000
Subject: merged branch 'danny0838:rewrite_block' and resolved conflict

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

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

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


From 14739a206f851219daa577abdfd7489d86b0072b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 6 Feb 2011 20:28:39 +0100
Subject: Revert "merged branch 'danny0838:rewrite_block' and resolved
 conflict"

Anika's merge did not pul in the individual patches as one would expect.

Then I messed up when trying to fix this by merging with danny's repo
again but used the wrong branch. So we're still missing two patches. To
have them apply cleanly I have to revert Anika's merge here. Another
merge for the missing two patches will follow.

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

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

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index bd396e2b4..fc2c8cbc5 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_array($title)){
-      if($title['title']) return '['.$title['title'].']';
-    } else if (is_null($title) || trim($title)==''){
+    if (is_null($title)){
       if (useHeading('content') && $id){
         $heading = p_get_first_heading($id,false);
         if ($heading) return $heading;
       }
       return $default;
-    } else {
+    } else if (is_string($title)){
       return $title;
+    } else if (is_array($title)){
+      if($title['title']) return '['.$title['title'].']';
     }
   }
 
-- 
cgit v1.2.3