diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
| commit | 9199737c351d653a1d384cb50ed0d185f6512826 (patch) | |
| tree | 2da4dbc0b92a72c767712549b6d90f53b0a3605e /inc/parser | |
| parent | e68653d8ef3df043761e4042c563d65731f9b9c6 (diff) | |
| parent | 2b537ba8dc1863d603770c208ae4f91d4d0877b9 (diff) | |
| download | rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.gz rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/metadata.php | 2 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php index fc2c8cbc5..136c37531 100644 --- a/inc/parser/metadata.php +++ b/inc/parser/metadata.php @@ -457,7 +457,7 @@ class Doku_Renderer_metadata extends Doku_Renderer { $isImage = false; if (is_null($title)){ if (useHeading('content') && $id){ - $heading = p_get_first_heading($id,false); + $heading = p_get_first_heading($id,METADATA_DONT_RENDER); if ($heading) return $heading; } return $default; diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index ab295dd01..1041268b1 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -1144,7 +1144,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { return $this->_imageTitle($title); } elseif ( is_null($title) || trim($title)=='') { if (useHeading($linktype) && $id) { - $heading = p_get_first_heading($id,true); + $heading = p_get_first_heading($id); if ($heading) { return $this->_xmlEntities($heading); } |