aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-02-03 21:33:47 +0000
committerplegall <plg@piwigo.org>2012-02-03 21:33:47 +0000
commit14f3e134e7555271beb4eed07ce2eb4434e62d3e (patch)
tree78a6794ea7af5d9136684323c0a10237e76c2690
parent4264acc26668d0a395e98890ed79e5da1f9cc322 (diff)
feature 2561: fix links on album administration screens
git-svn-id: http://piwigo.org/svn/trunk@13025 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin.php3
-rw-r--r--admin/cat_list.php3
-rw-r--r--admin/include/functions.php2
-rw-r--r--index.php3
4 files changed, 3 insertions, 8 deletions
diff --git a/admin.php b/admin.php
index edb2827ba..74a88911d 100644
--- a/admin.php
+++ b/admin.php
@@ -233,10 +233,9 @@ if (
'site_manager', // delete site
'site_update', // ?only POST
'cat_list', // delete cat
- 'cat_modify', // delete cat; public/private; lock/unlock
+ 'album', // delete cat; public/private; lock/unlock, permissions
'cat_move', // ?only POST
'cat_options', // ?only POST; public/private; lock/unlock
- 'cat_perm', // ?only POST
'picture_modify', // ?only POST; associate/dissociate
'user_perm',
'group_perm',
diff --git a/admin/cat_list.php b/admin/cat_list.php
index eed147607..c8df189d1 100644
--- a/admin/cat_list.php
+++ b/admin/cat_list.php
@@ -323,8 +323,7 @@ foreach ($categories as $category)
if ('private' == $category['status'])
{
- $tpl_cat['U_MANAGE_PERMISSIONS']=
- $base_url.'cat_perm&amp;cat='.$category['id'];
+ $tpl_cat['U_MANAGE_PERMISSIONS'] = $base_url.'album-'.$category['id'].'-permissions';
}
$template->append('categories', $tpl_cat);
}
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 6344d705f..b25991bed 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1996,10 +1996,8 @@ function get_active_menu($menu_page)
case 'album':
case 'cat_list':
- case 'cat_modify':
case 'cat_move':
case 'cat_options':
- case 'cat_perm':
case 'permalinks':
return 1;
diff --git a/index.php b/index.php
index 0af394c66..042d952e3 100644
--- a/index.php
+++ b/index.php
@@ -180,8 +180,7 @@ if (isset($page['category']) and is_admin())
{
$template->assign(
'U_EDIT',
- get_root_url().'admin.php?page=cat_modify'
- .'&amp;cat_id='.$page['category']['id']
+ get_root_url().'admin.php?page=album-'.$page['category']['id']
);
}