diff --git a/config/vanilla/config.php b/config/vanilla/config.php index 1b13e9c..4b06f1b 100644 --- a/config/vanilla/config.php +++ b/config/vanilla/config.php @@ -180,4 +180,12 @@ $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'; + +// 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 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); 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;