Merge pull request #297 from topcoder-platform/issues-281

Issues-281: missing where condition, Issues-163, Issues-146

Author: jmgasper

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';
+$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;

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);

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;