aboutsummaryrefslogtreecommitdiffstats
path: root/admin.php
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-10-04 16:03:25 +0000
committermistic100 <mistic@piwigo.org>2012-10-04 16:03:25 +0000
commitb3e71e424c0a78de76fa35ff980be4d65d83f573 (patch)
treea4cbf6ac0b34071f47302c60cd37e5577ac06728 /admin.php
parentb1cec7bf86b84296acc97ffed090bf1686964420 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin.php31
1 files changed, 2 insertions, 29 deletions
diff --git a/admin.php b/admin.php
index a27d4e72c..53b449918 100644
--- a/admin.php
+++ b/admin.php
@@ -156,16 +156,6 @@ else
$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 @@ if (
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 @@ include(PHPWG_ROOT_PATH.'include/page_header.php');
trigger_action('loc_end_admin');
+include(PHPWG_ROOT_PATH.'include/page_messages.php');
+
$template->pparse('admin');
include(PHPWG_ROOT_PATH.'include/page_tail.php');