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