merge r8167 from branch 2.1 to trunk

bug 2031 fixed: redirection after category deletion preserves the current
node in the category tree.

+ the confirmation message is displayed after redirect, thanks to session



git-svn-id: http://piwigo.org/svn/trunk@8168 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 6 insertions, 0 deletions

diff --git a/admin.php b/admin.php
index 25eca3f6e..3b508fe4d 100644
--- a/admin.php
+++ b/admin.php
@@ -90,6 +90,12 @@ else
 $page['errors'] = array();
 $page['infos']  = 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=';
 //----------------------------------------------------- template initialization