diff options
| author | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
|---|---|---|
| committer | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
| commit | dfab2416926631b7b08c6c89b62528ca2520f130 (patch) | |
| tree | 6c76af9d656eec6e74ed6c3c05d7ccc2b6ef5e48 /mod/photos.php | |
| parent | 09129cbe5f7e8cb331b68469b74438464960af0b (diff) | |
| parent | 7090b58f68251b8c4b39332f2ea051e95ead3df3 (diff) | |
| download | volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.gz volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.bz2 volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.zip | |
Merge remote-tracking branch 'upstream/master' into toc
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/photos.php b/mod/photos.php index df9880c8d..b2eb2847f 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -140,7 +140,7 @@ function photos_post(&$a) { ); if($r) { foreach($r as $i) { - drop_item($i['id'],false); + drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */); if(! $item_restrict) proc_run('php','include/notifier.php','drop',$i['id']); } @@ -354,7 +354,7 @@ function photos_post(&$a) { require_once('include/text.php'); $profile_uid = $a->profile['profile_uid']; - $results = linkify_tags($a, $rawtags, local_user(), $profile_uid); + $results = linkify_tags($a, $rawtags, (local_user()) ? local_user() : $profile_uid); $success = $results['success']; $post_tags = array(); |