diff options
| author | rub <rub@piwigo.org> | 2006-03-27 21:19:31 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2006-03-27 21:19:31 +0000 |
| commit | 51a4de797c76dbda26741acacbda76013caa5f64 (patch) | |
| tree | c1bb657262978e97aa19bb919275506d4a62029c | |
| parent | d63d25a61d2a7bf9272f78c73fbce6a7a3ff6eee (diff) | |
improvement issue 0000127&0000301:
o Fix Missing Adviser tests
o Improve pwg_high , set to is_the_guest default value for enabled_high
git-svn-id: http://piwigo.org/svn/trunk@1106 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/cat_list.php | 4 | ||||
| -rw-r--r-- | include/user.inc.php | 1 | ||||
| -rw-r--r-- | picture.php | 9 |
3 files changed, 6 insertions, 8 deletions
diff --git a/admin/cat_list.php b/admin/cat_list.php index 510f5e284..7917b0a6a 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -78,8 +78,8 @@ $navigation.= '</a>'; // +-----------------------------------------------------------------------+ // | virtual categories management | // +-----------------------------------------------------------------------+ -// request to delete a virtual category -if (isset($_GET['delete']) and is_numeric($_GET['delete'])) +// request to delete a virtual category / not for an adviser +if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser()) { delete_categories(array($_GET['delete'])); array_push($page['infos'], $lang['cat_virtual_deleted']); diff --git a/include/user.inc.php b/include/user.inc.php index 4b3dd13e8..83d86a6c7 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -78,6 +78,7 @@ if ($user['is_the_guest']) $user['recent_period'] = $conf['recent_period']; $user['expand'] = $conf['auto_expand']; $user['show_nb_comments'] = $conf['show_nb_comments']; + $user['enabled_high'] = $conf['newuser_default_enabled_high']; } // calculation of the number of picture to display per page diff --git a/picture.php b/picture.php index ac1b2efbe..98f5dc027 100644 --- a/picture.php +++ b/picture.php @@ -99,7 +99,7 @@ $url_self = duplicate_picture_URL(); * Actions finish by a redirection */ -if (isset($_GET['action'])) +if (isset($_GET['action']) and !is_adviser()) { switch ($_GET['action']) { @@ -139,7 +139,7 @@ DELETE FROM '.FAVORITES_TABLE.' } case 'set_as_representative' : { - if (is_admin() and isset($page['category']) and !is_adviser()) + if (is_admin() and isset($page['category'])) { $query = ' UPDATE '.CATEGORIES_TABLE.' @@ -159,10 +159,7 @@ UPDATE '.CATEGORIES_TABLE.' } case 'add_to_caddie' : { - if (!is_adviser()) - { - fill_caddie(array($page['image_id'])); - } + fill_caddie(array($page['image_id'])); redirect($url_self); break; } |