merge -r1329:1330 from branch 1.5 to trunk (bug 378 fixed).

git-svn-id: http://piwigo.org/svn/trunk@1331 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · May 31, 2006 · cfbadff · cfbadff
1 parent b2e246a
commit cfbadff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/feed.php b/feed.php
@@ -119,7 +119,7 @@ function ts_to_iso8601($ts)
                                                       $user['status']);
 if ('' == $user['forbidden_categories'])
 {
-  $user['forbidden_categories'] = '-1';
+  $user['forbidden_categories'] = '0';
 }
 
 list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));

diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
@@ -345,10 +345,10 @@ function calculate_permissions($user_id, $user_status)
   }
 
   if ( empty($forbidden_array) )
-  {// at least, the list contains -1 values. This category does not exists so
-   // where clauses such as "WHERE category_id NOT IN(-1)" will always be
+  {// at least, the list contains 0 value. This category does not exists so
+   // where clauses such as "WHERE category_id NOT IN(0)" will always be
    // true.
-    array_push($forbidden_array, '-1');
+    array_push($forbidden_array, 0);
   }
 
   return implode(',', $forbidden_array);
@@ -647,4 +647,4 @@ function is_adviser()
 
   return ($user['adviser'] == 'true');
 }
-?>
+?>