From ab68167682c3f6d282688e86b19321df09297536 Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Tue, 15 Dec 2020 18:34:45 +0300 Subject: [PATCH 1/4] Issues-281: missing where condition --- vanilla/applications/vanilla/models/class.discussionmodel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vanilla/applications/vanilla/models/class.discussionmodel.php b/vanilla/applications/vanilla/models/class.discussionmodel.php index d690148..16e71d5 100644 --- a/vanilla/applications/vanilla/models/class.discussionmodel.php +++ b/vanilla/applications/vanilla/models/class.discussionmodel.php @@ -507,6 +507,9 @@ public function get($offset = '0', $limit = '', $wheres = '', $additionalFields unset($wheres['Announce']); } + if (is_array($wheres)) { + $this->SQL->where($wheres); + } foreach ($orderBy as $orderField => $direction) { $this->SQL->orderBy($this->addFieldPrefix($orderField), $direction); From 2aa55da60ada61dbeec21a58241927b1571556b5 Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Tue, 15 Dec 2020 19:14:10 +0300 Subject: [PATCH 2/4] Issues-163: don't navigate to the latest comment --- .../vanilla/views/discussion/index.php | 21 +++---------------- .../views/discussions/helper_functions.php | 3 ++- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/vanilla/applications/vanilla/views/discussion/index.php b/vanilla/applications/vanilla/views/discussion/index.php index 2aa6a3a..8e29597 100644 --- a/vanilla/applications/vanilla/views/discussion/index.php +++ b/vanilla/applications/vanilla/views/discussion/index.php @@ -27,25 +27,10 @@ $this->fireEvent('AfterPageTitle'); // Write the initial discussion. -if ($this->data('Page') == 1) { - include $this->fetchViewLocation('discussion', 'discussion'); - echo ''; // close discussion wrap +include $this->fetchViewLocation('discussion', 'discussion'); +echo ''; // close discussion wrap +$this->fireEvent('AfterDiscussion'); - $this->fireEvent('AfterDiscussion'); -} else { - ?> -
-
-
- fireEvent('Replies'); - ?> -
-
-
- '; // close discussion wrap -} echo '
'; diff --git a/vanilla/applications/vanilla/views/discussions/helper_functions.php b/vanilla/applications/vanilla/views/discussions/helper_functions.php index fed5d45..935fa1e 100644 --- a/vanilla/applications/vanilla/views/discussions/helper_functions.php +++ b/vanilla/applications/vanilla/views/discussions/helper_functions.php @@ -122,7 +122,8 @@ function writeDiscussion($discussion, $sender, $session) { $category = CategoryModel::categories($discussion->CategoryID); if ($session->UserID) { - $discussionUrl .= '#latest'; + // FIX: don't navigate to an editor + // $discussionUrl .= '#latest'; } $sender->EventArguments['DiscussionUrl'] = &$discussionUrl; $sender->EventArguments['Discussion'] = &$discussion; From 833deaf213e7ce1a8defda2c0edd0754f25459f6 Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Tue, 15 Dec 2020 19:29:54 +0300 Subject: [PATCH 3/4] Issues-163: don't navigate to the latest comment --- config/vanilla/config.php | 5 ++++- .../vanilla/views/discussion/index.php | 21 ++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/config/vanilla/config.php b/config/vanilla/config.php index 1b13e9c..a14800b 100644 --- a/config/vanilla/config.php +++ b/config/vanilla/config.php @@ -180,4 +180,7 @@ $Configuration['Vanilla']['Activity']['SpamLock'] = '120'; $Configuration['Vanilla']['ActivityComment']['SpamCount'] = '5'; $Configuration['Vanilla']['ActivityComment']['SpamTime'] = '60'; -$Configuration['Vanilla']['ActivityComment']['SpamLock'] = '120'; \ No newline at end of file +$Configuration['Vanilla']['ActivityComment']['SpamLock'] = '120'; + +// Should users be automatically pushed to the last comment they read in a discussion? +$Configuration['Vanilla']['Comments']['AutoOffset'] = false; \ No newline at end of file diff --git a/vanilla/applications/vanilla/views/discussion/index.php b/vanilla/applications/vanilla/views/discussion/index.php index 8e29597..2aa6a3a 100644 --- a/vanilla/applications/vanilla/views/discussion/index.php +++ b/vanilla/applications/vanilla/views/discussion/index.php @@ -27,10 +27,25 @@ $this->fireEvent('AfterPageTitle'); // Write the initial discussion. -include $this->fetchViewLocation('discussion', 'discussion'); -echo '
'; // close discussion wrap -$this->fireEvent('AfterDiscussion'); +if ($this->data('Page') == 1) { + include $this->fetchViewLocation('discussion', 'discussion'); + echo ''; // close discussion wrap + $this->fireEvent('AfterDiscussion'); +} else { + ?> +
+
+
+ fireEvent('Replies'); + ?> +
+
+
+ '; // close discussion wrap +} echo '
'; From 64ad454c1f68cae2311a5b2110dc049b207a426c Mon Sep 17 00:00:00 2001 From: Bogdanova Olga Date: Tue, 15 Dec 2020 20:48:17 +0300 Subject: [PATCH 4/4] Issues-146: Updated MaxCommentLength,MinCommentLength --- config/vanilla/config.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/vanilla/config.php b/config/vanilla/config.php index a14800b..4b06f1b 100644 --- a/config/vanilla/config.php +++ b/config/vanilla/config.php @@ -182,5 +182,10 @@ $Configuration['Vanilla']['ActivityComment']['SpamTime'] = '60'; $Configuration['Vanilla']['ActivityComment']['SpamLock'] = '120'; -// Should users be automatically pushed to the last comment they read in a discussion? -$Configuration['Vanilla']['Comments']['AutoOffset'] = false; \ No newline at end of file +// Posting Settings: +// Should users be automatically pushed to the last comment they read in a discussion? +$Configuration['Vanilla']['Comments']['AutoOffset'] = false; +// Maximum number of characters allowed in a comment +$Configuration['Vanilla']['Comment']['MaxLength'] = 16000; +// Minimum comment length to discourage short comments +$Configuration['Vanilla']['Comment']['MinLength'] = 2; \ No newline at end of file