aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-11-28 09:30:57 +0100
committerMario <mario@mariovavti.com>2019-11-28 09:30:57 +0100
commitf2c73c0f45787a361f9fd57831a00c34e660fbd9 (patch)
treee99d7e74db23a916cba86a1527f6fcee82a0c2b3 /Zotlabs
parent78492d0037aacb829dd0cea13526f3631e8cf945 (diff)
parentc86b35da701674510a97ccc21e46581bd864cc31 (diff)
downloadvolse-hubzilla-f2c73c0f45787a361f9fd57831a00c34e660fbd9.tar.gz
volse-hubzilla-f2c73c0f45787a361f9fd57831a00c34e660fbd9.tar.bz2
volse-hubzilla-f2c73c0f45787a361f9fd57831a00c34e660fbd9.zip
Merge branch 'fix-listmode-spinner' into 'dev'
Move auto_save_draft to header from thread comment See merge request hubzilla/core!1793
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/ThreadItem.php5
-rw-r--r--Zotlabs/Module/Photos.php4
2 files changed, 2 insertions, 7 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 0f59953dc..32cd52751 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -789,8 +789,6 @@ class ThreadItem {
call_hooks('comment_buttons',$arr);
$comment_buttons = $arr['comment_buttons'];
- $feature_auto_save_draft = ((feature_enabled($conv->get_profile_owner(), 'auto_save_draft')) ? "true" : "false");
-
$comment_box = replace_macros($template,array(
'$return_path' => '',
'$threaded' => $this->is_threaded(),
@@ -825,8 +823,7 @@ class ThreadItem {
'$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false),
'$anonname' => [ 'anonname', t('Your full name (required)') ],
'$anonmail' => [ 'anonmail', t('Your email address (required)') ],
- '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ],
- '$auto_save_draft' => $feature_auto_save_draft
+ '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ]
));
return $comment_box;
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 13ec64ab9..43c9f86ee 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -1080,7 +1080,6 @@ 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',
@@ -1096,8 +1095,7 @@ class Photos extends \Zotlabs\Web\Controller {
'$submit' => t('Submit'),
'$preview' => t('Preview'),
'$ww' => '',
- '$feature_encrypt' => false,
- '$auto_save_draft' => $feature_auto_save_draft
+ '$feature_encrypt' => false
));
}
}