Changeset 11739 for trunk/include/category_cats.inc.php

Timestamp:

Jul 14, 2011, 12:03:36 AM (13 years ago)

Author:

plg

Message:

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)

File:

• trunk/include/category_cats.inc.php (modified) (2 diffs)

trunk/include/category_cats.inc.php

@@ -123 +123 @@
   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;
@@ -213 +213 @@
             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;