diff --git a/include/common.inc.php b/include/common.inc.php index 2c9364d38..35b6dd187 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -111,7 +111,7 @@ $conf = array(); $page = array(); $user = array(); $lang = array(); - +$warnings = array(); @include(PHPWG_ROOT_PATH .'include/mysql.inc.php'); if (!defined('PHPWG_INSTALLED')) @@ -147,14 +147,8 @@ SELECT id // which upgrades need to be applied? if (count(array_diff($existing, $applied)) > 0) { - ob_start();// buffer output so that cookies work - - echo - '

' - .'Some database upgrades are missing, ' - .'upgrade now' - .'

' - ; + $warnings[] = 'Some database upgrades are missing, ' + .'upgrade now'; } } @@ -176,12 +170,8 @@ if (defined('IN_ADMIN') and IN_ADMIN) if ($conf['gallery_locked']) { - ob_start(); // make sure we can send cookies - echo - '
' - .$lang['gallery_locked_message']; - echo '.'; - echo '
'; + $warnings[] = $lang['gallery_locked_message'] + . '.'; if ( basename($_SERVER["PHP_SELF"]) != 'identification.php' and !is_admin() ) @@ -218,17 +208,18 @@ include( if (is_adviser()) { - ob_start();// buffer output so that cookies work - echo ' -
-

-
'.$lang['adviser_mode_enabled'].' -
-

-
- '; + $warnings[] = $lang['adviser_mode_enabled']; } // template instance $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']); + +if (count($warnings) > 0) +{ + $template->assign_block_vars('warnings',array()); + foreach ($warnings as $warning) + { + $template->assign_block_vars('warnings.warning', array('WARNING'=>$warning)); + } +} ?> diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 8ba0ce6b3..929724a1d 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -30,5 +30,13 @@ the "text/nonsense" prevents gecko based browsers to load it -->
- {PAGE_BANNER} + +
+ +
+