Changeset 1414 for trunk/include

Timestamp:

Jun 29, 2006, 12:50:30 AM (18 years ago)

Author:

rub

Message:

Issue ID 0000375:

o Keep same format display
o Add css class
o rename warning to header_msg

Merge BSF r1411:1412 into branch-1_6

File:

• trunk/include/common.inc.php (modified) (5 diffs)

trunk/include/common.inc.php

@@ -112 +112 @@
 $user = array();
 $lang = array();
-$warnings = array();
+$header_msgs = array();
 
 @include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
@@ -148 +148 @@
   if (count(array_diff($existing, $applied)) > 0)
   {
-    $warnings[] = 'Some database upgrades are missing, '
+    $header_msgs[] = 'Some database upgrades are missing, '
       .'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>';
   }
@@ -171 +171 @@
 if ($conf['gallery_locked'])
 {
-  $warnings[] = $lang['gallery_locked_message']
+  $header_msgs[] = $lang['gallery_locked_message']
     . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>';
 
@@ -215 +215 @@
 if (is_adviser())
 {
-  $warnings[] = $lang['adviser_mode_enabled'];
+  $header_msgs[] = $lang['adviser_mode_enabled'];
 }
 
@@ -221 +221 @@
 $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));
+if (count($header_msgs) > 0)
+{
+  $template->assign_block_vars('header_msgs',array());
+  foreach ($header_msgs as $header_msg)
+  {
+    $template->assign_block_vars('header_msgs.header_msg', array('HEADER_MSG'=>$header_msg));
   }
 }