15 files changed, 35 insertions, 55 deletions
diff --git a/about.php b/about.php
index 44d546257..be6f4892f 100644
--- a/about.php
+++ b/about.php
@@ -57,7 +57,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theAboutPage', $themeconf['
 }
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('about');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/admin.php b/admin.php
index d1133c160..a49b45375 100644
--- a/admin.php
+++ b/admin.php
@@ -292,7 +292,7 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
 
 trigger_action('loc_end_admin');
 
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 
 $template->pparse('admin');
 
diff --git a/comments.php b/comments.php
index f2610e67f..07b4581fe 100644
--- a/comments.php
+++ b/comments.php
@@ -609,7 +609,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theCommentsPage', $themecon
 // +-----------------------------------------------------------------------+
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_comments');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('comments');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
 \ No newline at end of file
diff --git a/identification.php b/identification.php
index 477da7cdc..9c3de083e 100644
--- a/identification.php
+++ b/identification.php
@@ -110,7 +110,7 @@ if (!$conf['gallery_locked'] && (!isset($themeconf['hide_menu_on']) OR !in_array
 //----------------------------------------------------------- html code display
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_identification');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('identification');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index b29f214ef..5b6a5079b 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -614,4 +614,26 @@ function get_element_url_protection_handler($url, $infos)
   return get_action_url($infos['id'], 'e', false);
 }
 
+
+function flush_page_messages()
+{
+  global $template, $page;
+  if ($template->get_template_vars('page_refresh') === null)
+  {
+    foreach (array('errors','infos','warnings') as $mode)
+    {
+      if (isset($_SESSION['page_'.$mode]))
+      {
+        $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
+        unset($_SESSION['page_'.$mode]);
+      }
+
+      if (count($page[$mode]) != 0)
+      {
+        $template->assign($mode, $page[$mode]);
+      }
+    }
+  }
+}
+
 ?>
 \ No newline at end of file
diff --git a/include/page_messages.php b/include/page_messages.php
deleted file mode 100644
index 7da0a71f6..000000000
--- a/include/page_messages.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2013 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// messages only if no redirection
-if ($template->get_template_vars('page_refresh') === null)
-{
-  foreach (array('errors','infos','warnings') as $mode)
-  {
-    if (isset($_SESSION['page_'.$mode]))
-    {
-      $page[$mode] = array_merge($page[$mode], $_SESSION['page_'.$mode]);
-      unset($_SESSION['page_'.$mode]);
-    }
-
-    if (count($page[$mode]) != 0)
-    {
-      $template->assign($mode, $page[$mode]);
-    }
-  }
-}
-
-?>
-\ No newline at end of file
diff --git a/index.php b/index.php
index fa15655dd..fe79bc9f0 100644
--- a/index.php
+++ b/index.php
@@ -333,7 +333,7 @@ if (!empty($page['cat_slideshow_url']))
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_index');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->parse_index_buttons();
 $template->pparse('index');
 //------------------------------------------------------------ log informations
diff --git a/nbm.php b/nbm.php
index 0746b71dd..a15da2dc3 100644
--- a/nbm.php
+++ b/nbm.php
@@ -76,7 +76,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theNBMPage', $themeconf['hi
 // | html code display                                                     |
 // +-----------------------------------------------------------------------+
 include(PHPWG_ROOT_PATH.'include/page_header.php');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->parse('nbm');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/notification.php b/notification.php
index 85bf9fd3f..830bf9875 100644
--- a/notification.php
+++ b/notification.php
@@ -115,7 +115,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theNotificationPage', $them
 // +-----------------------------------------------------------------------+
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_notification');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('notification');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 
diff --git a/password.php b/password.php
index 762d8ae04..f242d48b5 100644
--- a/password.php
+++ b/password.php
@@ -357,7 +357,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('thePasswordPage', $themecon
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_password');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('password');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 
diff --git a/picture.php b/picture.php
index 1267f3def..99c1529e1 100644
--- a/picture.php
+++ b/picture.php
@@ -990,7 +990,7 @@ if ($conf['picture_menu'] AND (!isset($themeconf['hide_menu_on']) OR !in_array('
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_picture');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 if ($page['slideshow'] and $conf['light_slideshow'])
 {
   $template->pparse('slideshow');
diff --git a/profile.php b/profile.php
index ee81dd4bc..741fcc40e 100644
--- a/profile.php
+++ b/profile.php
@@ -85,7 +85,7 @@ SELECT '.implode(',', $fields).'
   
   include(PHPWG_ROOT_PATH.'include/page_header.php');
   trigger_action('loc_end_profile');
-  include(PHPWG_ROOT_PATH.'include/page_messages.php');
+  flush_page_messages();
   $template->pparse('profile');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }
diff --git a/register.php b/register.php
index 183d4f9b1..dfc5ac487 100644
--- a/register.php
+++ b/register.php
@@ -131,7 +131,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theRegisterPage', $themecon
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_register');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->parse('register');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/search.php b/search.php
index a24ca9363..3e4c0ab3a 100644
--- a/search.php
+++ b/search.php
@@ -234,7 +234,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theSearchPage', $themeconf[
 //------------------------------------------------------------ html code display
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_search');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('search');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
diff --git a/tags.php b/tags.php
index 7e54bfaac..2a7a0d83b 100644
--- a/tags.php
+++ b/tags.php
@@ -203,7 +203,7 @@ if (!isset($themeconf['hide_menu_on']) OR !in_array('theTagsPage', $themeconf['h
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_tags');
-include(PHPWG_ROOT_PATH.'include/page_messages.php');
+flush_page_messages();
 $template->pparse('tags');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');
 ?>
 \ No newline at end of file