aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-05-31 21:44:46 +0000
committerplegall <plg@piwigo.org>2006-05-31 21:44:46 +0000
commitcfbadffe5facc16a1690aa1528a3996d0619baa9 (patch)
tree62461f5375776bedd0e75604cd771ac1d8599d59
parentb2e246ae80208ac4703bd1a96e0a61c0400e77e2 (diff)
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
-rw-r--r--feed.php2
-rw-r--r--include/functions_user.inc.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/feed.php b/feed.php
index 2ce2e7778..ce307ece2 100644
--- a/feed.php
+++ b/feed.php
@@ -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
+?>