From e3776c06c37cc197709dac60892604dfea894ac2 Mon Sep 17 00:00:00 2001 From: Michael Hamann 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 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 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