feature 2761: Pass all kind of messages through session on admin

git-svn-id: http://piwigo.org/svn/trunk@18463 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Oct 4, 2012 · b3e71e4 · b3e71e4
1 parent b1cec7b
commit b3e71e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 30 deletions.
diff --git a/admin.php b/admin.php
@@ -156,16 +156,6 @@
   $page['page'] = 'intro';
 }
 
-$page['errors'] = array();
-$page['infos']  = array();
-$page['warnings']  = array();
-
-if (isset($_SESSION['page_infos']))
-{
-  $page['infos'] = array_merge($page['infos'], $_SESSION['page_infos']);
-  unset($_SESSION['page_infos']);
-}
-
 $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
 $conf_link = $link_start.'configuration&amp;section=';
 
@@ -290,27 +280,8 @@ function UC_name_compare($a, $b)
 trigger_action('loc_begin_admin_page');
 include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
 
-// +-----------------------------------------------------------------------+
-// | Errors, Infos & Warnings                                              |
-// +-----------------------------------------------------------------------+
-
 $template->assign('ACTIVE_MENU', get_active_menu($page['page']));
 
-if (count($page['errors']) != 0)
-{
-  $template->assign('errors', $page['errors']);
-}
-
-if (count($page['infos']) != 0)
-{
-  $template->assign('infos', $page['infos']);
-}
-
-if (count($page['warnings']) != 0)
-{
-  $template->assign('warnings', $page['warnings']);
-}
-
 // +-----------------------------------------------------------------------+
 // | Sending html code                                                     |
 // +-----------------------------------------------------------------------+
@@ -322,6 +293,8 @@ function UC_name_compare($a, $b)
 
 trigger_action('loc_end_admin');
 
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
+
 $template->pparse('admin');
 
 include(PHPWG_ROOT_PATH.'include/page_tail.php');

diff --git a/include/common.inc.php b/include/common.inc.php
@@ -64,6 +64,7 @@ function sanitize_mysql_kv(&$v, $k)
 $page = array(
   'infos' => array(),
   'errors' => array(),
+  'warnings' => array(),
   );
 $user = array();
 $lang = array();

diff --git a/include/page_messages.php b/include/page_messages.php
@@ -24,7 +24,7 @@
 // messages only if no redirection
 if ($template->get_template_vars('page_refresh') === null)
 {
-  foreach (array('errors','infos') as $mode)
+  foreach (array('errors','infos','warnings') as $mode)
   {
     if (isset($_SESSION['page_'.$mode]))
     {