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/html.php | |
| 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/html.php')
| -rw-r--r-- | inc/html.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/inc/html.php b/inc/html.php index 98ee8a496..67b1c10b7 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1041,7 +1041,10 @@ function html_conflict($text,$summary){ * @author Andreas Gohr <andi@splitbrain.org> */ function html_msgarea(){ - global $MSG; + global $MSG, $MSG_shown; + // store if the global $MSG has already been shown and thus HTML output has been started + $MSG_shown = true; + if(!isset($MSG)) return; $shown = array(); @@ -1053,6 +1056,8 @@ function html_msgarea(){ print '</div>'; $shown[$hash] = 1; } + + unset($GLOBALS['MSG']); } /** @@ -1221,9 +1226,9 @@ function html_edit(){ if($wr && $conf['license']){ $form->addElement(form_makeOpenTag('div', array('class'=>'license'))); $out = $lang['licenseok']; - $out .= '<a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"'; + $out .= ' <a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"'; if(isset($conf['target']['extern'])) $out .= ' target="'.$conf['target']['extern'].'"'; - $out .= '> '.$license[$conf['license']]['name'].'</a>'; + $out .= '>'.$license[$conf['license']]['name'].'</a>'; $form->addElement($out); $form->addElement(form_makeCloseTag('div')); } |