adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1331 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2006-05-31 21:44:46 +00:00
parent b2e246ae80
commit cfbadffe5f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feed.php
+1 -1
View File
@@ -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();'));
include/functions_user.inc.php
+4 -4
View File
@@ -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');
}
?>
?>