merge r11738 from branch 2.2 to trunk

bug 2375 fixed: ability to deactivate representative cache on sub-albums (['representative_cache_on_subcats']) or when searching for another representative due to privacy level (['representative_cache_on_level'])


git-svn-id: http://piwigo.org/svn/trunk@11739 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-07-13 22:03:36 +00:00
parent aefd941d75
commit 64adb8eac1
2 changed files with 18 additions and 3 deletions
+6 -3
View File
@@ -122,7 +122,7 @@ while ($row = pwg_db_fetch_assoc($result))
if (isset($image_id))
{
if ($row['user_representative_picture_id'] != $image_id)
if ($conf['representative_cache_on_subcats'] and $row['user_representative_picture_id'] != $image_id)
{
$user_representative_updates_for[ $user['id'].'#'.$row['id'] ] = $image_id;
}
@@ -212,8 +212,11 @@ SELECT id, path, tn_ext, level
{
array_push($new_image_ids, $image_id);
}
$user_representative_updates_for[ $user['id'].'#'.$category['id'] ] = $image_id;
if ($conf['representative_cache_on_level'])
{
$user_representative_updates_for[ $user['id'].'#'.$category['id'] ] = $image_id;
}
$category['representative_picture_id'] = $image_id;
}