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

2 files changed, 18 insertions, 3 deletions

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index f445afa38..cdaddf8c6 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -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;
         }
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index f6f02be99..c57929471 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -222,6 +222,18 @@ $conf['display_fromto'] = false;
 // Maintenance].
 $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
 // category and element description.
 $conf['allow_html_descriptions'] = true;