summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny <danny0838@gmail.com>2011-12-17 13:18:12 +0800
committerDanny <danny0838@gmail.com>2011-12-17 13:18:12 +0800
commit85038eabd994f3b7609fee54bfbaab2513f28c1e (patch)
treece7e1672674dc32963f1035229a15f663b0769a5
parentfb838798781d6a7a488c82a93c69853bb5cb08d8 (diff)
downloadrpg-85038eabd994f3b7609fee54bfbaab2513f28c1e.tar.gz
rpg-85038eabd994f3b7609fee54bfbaab2513f28c1e.tar.bz2
Rework for missing commit 08162f005f3ced0555de590dc1a53155af99d998
-rw-r--r--inc/parser/metadata.php10
1 files changed, 5 insertions, 5 deletions
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'].']';
}
}