Changeset 8168 for trunk

Timestamp:

Dec 17, 2010, 1:11:56 AM (13 years ago)

Author:

plg

Message:

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

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/cat_list.php (modified) (1 diff)

trunk/admin.php

@@ -90 +90 @@
 $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=';

trunk/admin/cat_list.php

@@ -107 +107 @@
 {
   delete_categories(array($_GET['delete']));
-  array_push($page['infos'], l10n('Virtual album deleted'));
+  $_SESSION['page_infos'] = array(l10n('Virtual album deleted'));
   update_global_rank();
-  redirect(get_root_url().'admin.php?page=cat_list');
+
+  $redirect_url = get_root_url().'admin.php?page=cat_list';
+  if (isset($_GET['parent_id']))
+  {
+    $redirect_url.= '&parent_id='.$_GET['parent_id'];
+  }  
+  redirect($redirect_url);
 }
 // request to add a virtual category