Skip to content

Commit 3e65953

Browse files
committed
New fixes for JavaScript and other.
1 parent 5cda758 commit 3e65953

14 files changed

+470
-247
lines changed

event/listener.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,15 @@ public function delete_re($event)
207207

208208
// Ctrl+Enter submit
209209
$page_data = array_merge($page_data, array(
210-
'S_QR_CE_ENABLE' => $this->helper->plugins_helper->qr_ctrlenter_enabled(),
210+
'S_QR_CE_ENABLE' => $this->helper->plugins_helper->qr_ctrlenter_enabled(),
211+
'S_QR_FULL_QUOTE_ALLOWED' => $this->auth->acl_get('f_qr_full_quote', $forum_id),
212+
'S_QR_LAST_QUOTE' => $this->config['qr_last_quote'],
211213
));
212214

213215
$event['post_data'] = $post_data;
214216
$event['page_data'] = $page_data;
217+
218+
$this->user->add_lang_ext('boardtools/quickreply', 'quickreply');
215219
}
216220

217221
/**

functions/plugins_helper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function cannot_change_subject($forum_id, $mode, &$topic_first_post_id, $
115115
return (
116116
!$this->auth->acl_get('f_qr_change_subject', $forum_id)
117117
&& $mode != 'post'
118-
&& ($topic_first_post_id != $post_id)
118+
&& ($topic_first_post_id != $post_id || $mode == 'quote')
119119
);
120120
}
121121

migrations/v1xx/v_1_1_0_RC1.php migrations/v1xx/v_1_1_0_rc1.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace boardtools\quickreply\migrations\v1xx;
1111

12-
class v_1_1_0_RC1 extends \phpbb\db\migration\migration
12+
class v_1_1_0_rc1 extends \phpbb\db\migration\migration
1313
{
1414
public function effectively_installed()
1515
{

styles/all/template/event/overall_header_head_append.html

+2
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@
99
<!-- ENDIF -->
1010
<!-- DEFINE $INCLUDED_FONTAWESOMECSS = true -->
1111
<!-- ENDIF -->
12+
<!-- ELSE IF S_IN_POSTING -->
13+
<!-- INCLUDECSS @boardtools_quickreply/quickreply.css -->
1214
<!-- ENDIF -->
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<script type="text/javascript">
2+
// <![CDATA[
3+
var quickreply = {};
4+
5+
// Posting related variables for QuickReply.
6+
quickreply.posting = {
7+
language: {
8+
ERROR: '{LA_ERROR}',
9+
NO_FULL_QUOTE: '{LA_QR_NO_FULL_QUOTE}'
10+
},
11+
settings: {
12+
fullQuoteAllowed: <!-- IF S_QR_FULL_QUOTE_ALLOWED -->true<!-- ELSE -->false<!-- ENDIF -->,
13+
hideSubjectBox: <!-- IF QR_HIDE_SUBJECT_BOX -->true<!-- ELSE -->false<!-- ENDIF -->,
14+
lastQuote: <!-- IF S_QR_LAST_QUOTE -->true<!-- ELSE -->false<!-- ENDIF -->,
15+
unchangedSubject: <!-- IF S_QR_NOT_CHANGE_SUBJECT -->true<!-- ELSE -->false<!-- ENDIF -->
16+
}
17+
};
18+
// ]]>
19+
</script>
20+
<!-- INCLUDEJS @boardtools_quickreply/quickreply_posting.js -->

0 commit comments

Comments
 (0)