Changeset 1106 for trunk

Timestamp:

Mar 27, 2006, 11:19:31 PM (19 years ago)

Author:

rub

Message:

improvement issue 0000127&0000301:

o Fix Missing Adviser tests
o Improve pwg_high , set to is_the_guest default value for enabled_high

Location:

trunk

Files:

• admin/cat_list.php (modified) (1 diff)
• include/user.inc.php (modified) (1 diff)
• picture.php (modified) (3 diffs)

trunk/admin/cat_list.php

@@ -79 +79 @@
 // |                    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']));

trunk/include/user.inc.php

@@ -79 +79 @@
   $user['expand'] = $conf['auto_expand'];
   $user['show_nb_comments'] = $conf['show_nb_comments'];
+  $user['enabled_high'] = $conf['newuser_default_enabled_high'];
 }
 

trunk/picture.php

@@ -100 +100 @@
  */
 
-if (isset($_GET['action']))
+if (isset($_GET['action']) and !is_adviser())
 {
   switch ($_GET['action'])
@@ -140 +140 @@
     case 'set_as_representative' :
     {
-      if (is_admin() and isset($page['category']) and !is_adviser())
+      if (is_admin() and isset($page['category']))
       {
         $query = '
@@ -160 +160 @@
     case 'add_to_caddie' :
     {
-      if (!is_adviser())
-      {
-        fill_caddie(array($page['image_id']));
-      }
+      fill_caddie(array($page['image_id']));
       redirect($url_self);
       break;