nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Friendika 2011-02-07 21:16:39 -08:00
parent 18c5d1ff90
commit 9f5d3000c7
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/items.php
View file

@ -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 * 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 * $xml = the (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
* handles both, but we don't claim it will work well, and are reasonably certain it won't. *
* $importer = the contact_record (joined to user_record) of the local user who owns this relationship. * $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. * 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 * $contact = the person who is sending us stuff. If not set, we MAY be processing a "follow" activity

8
mod/photos.php
View file

@ -268,6 +268,13 @@ foreach($_FILES AS $key => $val) {
intval($page_owner_uid) 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) { if(! $item_id) {
// Create item container // Create item container
@ -297,6 +304,7 @@ foreach($_FILES AS $key => $val) {
$arr['deny_cid'] = $p[0]['deny_cid']; $arr['deny_cid'] = $p[0]['deny_cid'];
$arr['deny_gid'] = $p[0]['deny_gid']; $arr['deny_gid'] = $p[0]['deny_gid'];
$arr['last-child'] = 1; $arr['last-child'] = 1;
$arr['visible'] = $visibility;
$arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' $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]' . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]'
. '[/url]'; . '[/url]';