Update cache on photo edit only when album name has changed

diff --git a/mod/photos.php b/mod/photos.php
index 24325f1cc5c939907e4e5d0dfe68202cc7edcb12..e026944423491748732f7a02a25e4c8c376513bf 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -380,10 +380,11 @@ function photos_post(&$a) {
 
        if (($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
 
-               $desc        = ((x($_POST,'desc'))    ? notags(trim($_POST['desc']))    : '');
-               $rawtags     = ((x($_POST,'newtag'))  ? notags(trim($_POST['newtag']))  : '');
-               $item_id     = ((x($_POST,'item_id')) ? intval($_POST['item_id'])       : 0);
-               $albname     = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : '');
+               $desc        = ((x($_POST,'desc'))      ? notags(trim($_POST['desc']))    : '');
+               $rawtags     = ((x($_POST,'newtag'))    ? notags(trim($_POST['newtag']))  : '');
+               $item_id     = ((x($_POST,'item_id'))   ? intval($_POST['item_id'])       : 0);
+               $albname     = ((x($_POST,'albname'))   ? notags(trim($_POST['albname'])) : '');
+               $origaname   = ((x($_POST,'origaname')) ? notags(trim($_POST['origaname'])) : '');
                $str_group_allow   = perms2str($_POST['group_allow']);
                $str_contact_allow = perms2str($_POST['contact_allow']);
                $str_group_deny    = perms2str($_POST['group_deny']);
@@ -467,8 +468,10 @@ function photos_post(&$a) {
                                dbesc($resource_id),
                                intval($page_owner_uid)
                        );
-                       // Update the photo albums cache
-                       photo_albums($page_owner_uid, true);
+                       // Update the photo albums cache if album name was changed
+                       if ($albname !== $origaname) {
+                               photo_albums($page_owner_uid, true);
+                       }
                }
 
                /* Don't make the item visible if the only change was the album name */

diff --git a/view/templates/photo_edit.tpl b/view/templates/photo_edit.tpl
index d435f7f3250587f507025f15326513dc91e80782..714a97dce5dbbbf45cf8c29e5a4366fe871ba9de 100644 (file)
--- a/view/templates/photo_edit.tpl
+++ b/view/templates/photo_edit.tpl
@@ -3,6 +3,7 @@
 <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
        <input type="hidden" name="item_id" value="{{$item_id}}" />
+       <input type="hidden" name="origaname" value="{{$album.2}}" />
 
        {{include file="field_input.tpl" field=$album}}
        {{include file="field_input.tpl" field=$caption}}