Merge pull request #143 from topcoder-platform/ci-test

Ci test

Author: jmgasper

config/vanilla/bootstrap.before.php

@@ -1,4 +1,8 @@
-<?php if (!defined('APPLICATION')) exit();
+<?php
+
+use Vanilla\Formatting\DateTimeFormatter;
+
+if (!defined('APPLICATION')) exit();
 
 if (!function_exists('formatString')) {
     /**
@@ -279,6 +283,41 @@ function_exists('topcoderRoleCssStyles')) {
                     break;
             }
         }
+        return $result;
+    }
+}
+
+if (!function_exists('dateUpdated')) {
+    /**
+     *
+     * Fixed issues with date format:
+     * package/library/core/functions.render.php
+     *
+     * @param $row
+     * @param null $wrap
+     * @return string
+     */
+    function dateUpdated($row, $wrap = null) {
+        $result = '';
+        $dateUpdated = val('DateUpdated', $row);
+        $updateUserID = val('UpdateUserID', $row);
+
+        if ($dateUpdated) {
+            $updateUser = Gdn::userModel()->getID($updateUserID);
+            $dateUpdatedFormatted = Gdn::getContainer()->get(DateTimeFormatter::class)->formatDate($dateUpdated, false, DateTimeFormatter::FORCE_FULL_FORMAT);
+            if ($updateUser) {
+                $title = sprintf(t('Edited %s by %s.'), $dateUpdatedFormatted, val('Name', $updateUser));
+            } else {
+                $title = sprintf(t('Edited %s.'), $dateUpdatedFormatted);
+            }
+
+            $result = ' <span title="'.htmlspecialchars($title).'" class="DateUpdated">'.
+                sprintf(t('edited %s'), $dateUpdatedFormatted).'</span> ';
+            if ($wrap) {
+                $result = $wrap[0].$result.$wrap[1];
+            }
+        }
+
         return $result;
     }
 }

config/vanilla/config.php

@@ -33,6 +33,7 @@
 $Configuration['EnabledPlugins']['Groups'] = true;
 $Configuration['EnabledPlugins']['Filestack'] = true;
 $Configuration['EnabledPlugins']['Sumologic'] = true;
+// $Configuration['EnabledPlugins']['ReplyTo'] = true; //Uncomment it after upgrading DB
 
 // Debug
 $Configuration['Debug'] = FALSE;

vanilla/applications/vanilla/js/discussion.js

@@ -370,6 +370,8 @@ jQuery(document).ready(function($) {
                     $(this).remove();
                 });
                 gdn.processTargets(json.Targets);
+                // Let listeners know that the comment was deleted.
+                $(document).trigger('CommentDeleted');
             }
         }
     });