From 85038eabd994f3b7609fee54bfbaab2513f28c1e Mon Sep 17 00:00:00 2001
From: Danny <danny0838@gmail.com>
Date: Sat, 17 Dec 2011 13:18:12 +0800
Subject: Rework for missing commit 08162f005f3ced0555de590dc1a53155af99d998

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

(limited to 'inc/parser')

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 136c37531..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,METADATA_DONT_RENDER);
+        $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