aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photos.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-18 13:14:34 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-18 13:14:34 -0700
commit51db7536380d70e2047aa91c3a12809cc3444aa8 (patch)
tree359c67869e57a5c42aed637f63c2dd7953bddbb7 /mod/photos.php
parente271035879660bc9996101f3a23d61c88ecd5f53 (diff)
parent7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (diff)
downloadvolse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.gz
volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.bz2
volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.zip
Merge branch 'tres'
Diffstat (limited to 'mod/photos.php')
-rw-r--r--mod/photos.php17
1 files changed, 3 insertions, 14 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 296aab67f..7cbb798a8 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -180,19 +180,8 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
if(count($i)) {
- q("UPDATE `item` SET item_restrict = (item_restrict | %d), `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d",
- intval(ITEM_DELETED),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc($i[0]['mid']),
- intval($page_owner_uid)
- );
-
+ drop_item($i[0]['id'],true,DROPITEM_PHASE1);
$url = $a->get_baseurl();
- $drop_id = intval($i[0]['id']);
-
- if($i[0]['visible'])
- proc_run('php',"include/notifier.php","drop","$drop_id");
}
}
@@ -878,8 +867,8 @@ function photos_content(&$a) {
}
}
- if((local_channel()) && (local_channel() == $link_item['uid'])) {
- q("UPDATE `item` SET item_unseen = 0 WHERE item_unseen = 1 AND parent = %d AND uid = %d ",
+ if((local_channel()) && (local_user() == $link_item['uid'])) {
+ q("UPDATE `item` SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
intval($link_item['parent']),
intval(local_channel())
);