diff options
| author | plegall <plg@piwigo.org> | 2011-07-13 22:03:36 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-07-13 22:03:36 +0000 |
| commit | 64adb8eac1399f83b867ffae20dfff5dcca80c76 (patch) | |
| tree | 9fcb96b4237649884737dfd439b969d05d17a3bb /include/category_cats.inc.php | |
| parent | aefd941d758b7a5f471236f9108b2e443c5f5d79 (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | include/category_cats.inc.php | 9 |
1 files changed, 6 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; } |