aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-12-10 21:49:12 +0100
committerM. Dent <dentm42@gmail.com>2018-12-10 21:49:12 +0100
commit4cb4f175004fe28cfec449932b7f3fe1a36ab8a7 (patch)
treed533bd88c7572a720c1151b3e245fd3069350a62 /Zotlabs
parent15a689c6f549e25a1301a8cb8ba92c4cd4f90300 (diff)
parent7894fed7413ab3bd782bf939b17ca70bf0196d28 (diff)
downloadvolse-hubzilla-4cb4f175004fe28cfec449932b7f3fe1a36ab8a7.tar.gz
volse-hubzilla-4cb4f175004fe28cfec449932b7f3fe1a36ab8a7.tar.bz2
volse-hubzilla-4cb4f175004fe28cfec449932b7f3fe1a36ab8a7.zip
Merge branch 'photo-hook' into 'dev'
add photo_view_filter hook and fix minor issue with unset auto_save_draft… See merge request hubzilla/core!1425
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Photos.php13
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;