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&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');