diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions_html.inc.php | 22 | ||||
| -rw-r--r-- | include/page_messages.php | 42 |
2 files changed, 22 insertions, 42 deletions
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 |