diff options
| author | friendica <info@friendica.com> | 2014-10-12 01:40:48 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-12 01:40:48 -0700 |
| commit | 4bf758cc5b4b204fce0560af2fce719f37f2a9a3 (patch) | |
| tree | 92ba56d36032c4d15141f3a1e397e8bbda434702 | |
| parent | fd00a24957fdb9413523b19a014658a0cc87b4bf (diff) | |
| download | volse-hubzilla-4bf758cc5b4b204fce0560af2fce719f37f2a9a3.tar.gz volse-hubzilla-4bf758cc5b4b204fce0560af2fce719f37f2a9a3.tar.bz2 volse-hubzilla-4bf758cc5b4b204fce0560af2fce719f37f2a9a3.zip | |
content deletion issue
| -rwxr-xr-x | include/items.php | 7 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index c4ae948b8..40343d505 100755 --- a/include/items.php +++ b/include/items.php @@ -3977,7 +3977,12 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) { // send the notification upstream/downstream as the case may be // only send notifications to others if this is the owner's wall item. - if(($item['item_flags'] & ITEM_WALL) && ($stage != DROPITEM_PHASE2)) + // This isn't optimal. We somehow need to pass to this function whether or not + // to call the notifier, or we need to call the notifier from the calling function. + // We'll rely on the undocumented behaviour that DROPITEM_PHASE1 is (hopefully) only + // set if we know we're going to send delete notifications out to others. + + if((($item['item_flags'] & ITEM_WALL) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1)) proc_run('php','include/notifier.php','drop',$notify_id); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); diff --git a/version.inc b/version.inc index e509fa400..5c34749ec 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-10-10.824 +2014-10-12.826 |