From cfd6851c109965e9dab9333f8f41ecf65e64decf Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 17 Dec 2010 00:11:56 +0000 Subject: 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 --- admin/cat_list.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'admin/cat_list.php') diff --git a/admin/cat_list.php b/admin/cat_list.php index e485a3d21..b75b4d084 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -106,9 +106,15 @@ $navigation.= ''; if (isset($_GET['delete']) and is_numeric($_GET['delete'])) { 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 else if (isset($_POST['submitAdd'])) -- cgit v1.2.3