don't change photo visibility if only album name was changed

diff --git a/include/items.php b/include/items.php
index 9c29e6558634f963f8ffefa50ff050eeac023b21..5d9eaaaf3fb0f1b738d029229bfc8523499b77c8 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -859,12 +859,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 }
 
 
-/*
+/**
  *
  * consume_feed - process atom feed and update anything/everything we might need to update
  *
- * $xml = the (atom) feed to consume - no RSS spoken here, it might partially work since simplepie 
- *        handles both, but we don't claim it will work well, and are reasonably certain it won't.
+ * $xml = the (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
+ *
  * $importer = the contact_record (joined to user_record) of the local user who owns this relationship.
  *             It is this person's stuff that is going to be updated.
  * $contact =  the person who is sending us stuff. If not set, we MAY be processing a "follow" activity

diff --git a/mod/photos.php b/mod/photos.php
index 1a1ebaac1933cbdd78bd9a162e3b5b42814c047d..9acde458df4df001efcc35fee5d818dd5a2744f7 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -268,6 +268,13 @@ foreach($_FILES AS $key => $val) {
                                intval($page_owner_uid)
                        );
                }
+
+               /* Don't make the item visible if the only change was the album name */
+
+               $visibility = 0;
+               if($p[0]['desc'] !== $desc || strlen($rawtags))
+                       $visibility = 1;
+               
                if(! $item_id) {
 
                        // Create item container
@@ -297,6 +304,7 @@ foreach($_FILES AS $key => $val) {
                        $arr['deny_cid']      = $p[0]['deny_cid'];
                        $arr['deny_gid']      = $p[0]['deny_gid'];
                        $arr['last-child']    = 1;
+                       $arr['visible']       = $visibility;
                        $arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
                                                . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' 
                                                . '[/url]';