diff options
author | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
commit | 2848f5dab4e0f904280e77d6403ab69926cabe1d (patch) | |
tree | bcb2f2a70660d7abe319b126035d2e0b2ddd2c41 /mod/photos.php | |
parent | 3c7d2d4cea80fae5113de8c78ed522ce8b32c16d (diff) | |
parent | f0f5a8f2b510b92aa1fde2cbaf118a784c154432 (diff) | |
download | volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.gz volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.bz2 volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod/photos.php')
-rw-r--r-- | mod/photos.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mod/photos.php b/mod/photos.php index cd293b39d..320e2beed 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -149,8 +149,9 @@ function photos_post(&$a) { if($r) { foreach($r as $i) { attach_delete($page_owner_uid, $i['resource_id'], 1 ); - drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */); - proc_run('php','include/notifier.php','drop',$i['id']); + // This is now being done in attach_delete() + // drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */); + // proc_run('php','include/notifier.php','drop',$i['id']); } } @@ -982,13 +983,13 @@ function photos_content(&$a) { $likebuttons = ''; if($can_post || $can_comment) { - $likebuttons = replace_macros($like_tpl,array( - '$id' => $link_item['id'], - '$likethis' => t("I like this \x28toggle\x29"), - '$nolike' => t("I don't like this \x28toggle\x29"), - '$share' => t('Share'), - '$wait' => t('Please wait') - )); + $likebuttons = array( + 'id' => $link_item['id'], + 'likethis' => t("I like this \x28toggle\x29"), + 'nolike' => t("I don't like this \x28toggle\x29"), + 'share' => t('Share'), + 'wait' => t('Please wait') + ); } $comments = ''; |