diff options
| author | zotlabs <mike@macgirvin.com> | 2018-12-13 16:13:13 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-12-13 16:13:13 -0800 |
| commit | fc782060496ee5ca99ffe522b10e6463f4d08cc7 (patch) | |
| tree | 1241d2178cdd2801be485e9f25d710eccf76e2c7 /Zotlabs/Module/Photos.php | |
| parent | 6464099364f3d4e800137a57d3b9ff9e8f7601e4 (diff) | |
| parent | 6bea3d6bfc984e6f30867f00be5a92b5cd5be925 (diff) | |
| download | volse-hubzilla-fc782060496ee5ca99ffe522b10e6463f4d08cc7.tar.gz volse-hubzilla-fc782060496ee5ca99ffe522b10e6463f4d08cc7.tar.bz2 volse-hubzilla-fc782060496ee5ca99ffe522b10e6463f4d08cc7.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Photos.php')
| -rw-r--r-- | Zotlabs/Module/Photos.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 21f6293ef..b87c586da 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -1122,6 +1122,7 @@ class Photos extends \Zotlabs\Web\Controller { $comments = ''; if(! $r) { if($observer && ($can_post || $can_comment)) { + $feature_auto_save_draft = ((feature_enabled($owner_uid, 'auto_save_draft')) ? "true" : "false"); $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$mode' => 'photos', @@ -1137,7 +1138,8 @@ class Photos extends \Zotlabs\Web\Controller { '$submit' => t('Submit'), '$preview' => t('Preview'), '$ww' => '', - '$feature_encrypt' => false + '$feature_encrypt' => false, + '$auto_save_draft' => $feature_auto_save_draft )); } } @@ -1270,8 +1272,14 @@ class Photos extends \Zotlabs\Web\Controller { if(feature_enabled($owner_uid,'dislike')) $response_verbs[] = 'dislike'; - $responses = get_responses($conv_responses,$response_verbs,'',$link_item); + + $hookdata = [ + 'onclick' => '$.colorbox({href: \'' . $photo['href'] . '\'}); return false;', + 'raw_photo' => $ph[0], + 'nickname' => \App::$data['channel']['channel_address'] + ]; + call_hooks('photo_view_filter', $hookdata); $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( @@ -1309,6 +1317,7 @@ class Photos extends \Zotlabs\Web\Controller { '$comments' => $comments, '$commentbox' => $commentbox, '$paginate' => $paginate, + '$onclick' => $hookdata['onclick'] )); \App::$data['photo_html'] = $o; |