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 r11738 from branch 2.2 to trunk

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
include/category_cats.inc.php
+6 -3
View File
@@ -122,7 +122,7 @@ while ($row = pwg_db_fetch_assoc($result))
if (isset($image_id)) 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; $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); 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; $category['representative_picture_id'] = $image_id;
} }
include/config_default.inc.php
+12
View File
@@ -222,6 +222,18 @@ $conf['display_fromto'] = false;
// Maintenance]. // Maintenance].
$conf['allow_random_representative'] = false; $conf['allow_random_representative'] = false;
// representative_cache_on_level: if a thumbnail is chosen as representative
// but has higher privacy level than current user, Piwigo randomly selects
// another thumbnail. Should be store this thumbnail in cache to avoid
// another consuming SQL query on next page refresh?
$conf['representative_cache_on_level'] = true;
// representative_cache_on_subcats: if a category (= album) only contains
// sub-categories, Piwigo randomly selects a thumbnail among sub-categories
// representative. Should we store this thumbnail in cache to avoid another
// "slightly" consuming SQL query on next page refresh?
$conf['representative_cache_on_subcats'] = true;
// allow_html_descriptions : authorize administrators to use HTML in // allow_html_descriptions : authorize administrators to use HTML in
// category and element description. // category and element description.
$conf['allow_html_descriptions'] = true; $conf['allow_html_descriptions'] = true;