diff options
| author | Adrian Lang <dokuwiki@adrianlang.de> | 2011-01-14 21:45:52 +0100 |
|---|---|---|
| committer | Adrian Lang <dokuwiki@adrianlang.de> | 2011-01-14 21:45:52 +0100 |
| commit | 731ae6527af8e2b8cdb211aecac260988e8379e9 (patch) | |
| tree | a44a5637394e7fee3c5835e3955cd716699bbea8 /inc/parser | |
| parent | fa7c70ff4d7f9999466436e7d559eb0c81571779 (diff) | |
| parent | 301971b3769a2d1a440cf58fd84f2c100a1348e3 (diff) | |
| download | rpg-731ae6527af8e2b8cdb211aecac260988e8379e9.tar.gz rpg-731ae6527af8e2b8cdb211aecac260988e8379e9.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/metadata.php | 5 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index 263745593..fc2c8cbc5 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'] = ''; } @@ -461,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'].']'; } } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index b0d93f93e..9405d9420 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -734,9 +734,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $name = $this->_getLinkTitle($name, '', $isImage); if ( !$isImage ) { - $link['class']='mail JSnocheck'; + $link['class']='mail'; } else { - $link['class']='media JSnocheck'; + $link['class']='media'; } $address = $this->_xmlEntities($address); |