adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r8167 from branch 2.1 to trunk

Browse Source 
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
This commit is contained in:
plegall
2010-12-17 00:11:56 +00:00
parent d5549a0bff
commit cfd6851c10
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin.php
+6
View File
@@ -90,6 +90,12 @@ else
$page['errors'] = array(); $page['errors'] = array();
$page['infos'] = 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='; $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
$conf_link = $link_start.'configuration&section='; $conf_link = $link_start.'configuration&section=';
//----------------------------------------------------- template initialization //----------------------------------------------------- template initialization
admin/cat_list.php
+8 -2
View File
@@ -106,9 +106,15 @@ $navigation.= '</a>';
if (isset($_GET['delete']) and is_numeric($_GET['delete'])) if (isset($_GET['delete']) and is_numeric($_GET['delete']))
{ {
delete_categories(array($_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(); 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 // request to add a virtual category
else if (isset($_POST['submitAdd'])) else if (isset($_POST['submitAdd']))