diff options
| author | plegall <plg@piwigo.org> | 2006-05-31 21:46:26 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2006-05-31 21:46:26 +0000 |
| commit | b3e331dc28cf36536a438d38af61f10484992a5f (patch) | |
| tree | f43fc1494c1b1318eeffc12976460f6544433b26 | |
| parent | fe106bd3daf72a556a17a1a7d9930583c7560610 (diff) | |
merge -r1330:1331 from trunk to branch 1.6 (bug 378 fixed).
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1332 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | feed.php | 2 | ||||
| -rw-r--r-- | include/functions_user.inc.php | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -119,7 +119,7 @@ $user['forbidden_categories'] = calculate_permissions($user['id'], $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 index 90fda9e55..a2ca7086e 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -345,10 +345,10 @@ SELECT id } 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'); } -?>
\ No newline at end of file +?> |