Merge pull request #251 from topcoder-platform/issues-217

Issues-247

Author: jmgasper

config/vanilla/bootstrap.before.php

@@ -263,8 +263,8 @@ function _formatStringCallback($match, $setArgs = false) {
                             // Manually build instead of using userAnchor() because of special 'You' case.
                             if(function_exists('topcoderRatingCssClass') &&
                                 function_exists('topcoderRoleCssStyles')) {
-                                $ratingCssClass = topcoderRatingCssClass($user->Name);
-                                $roleCssClass = topcoderRoleCssStyles($user->Name);
+                                $ratingCssClass = topcoderRatingCssClass($user);
+                                $roleCssClass = topcoderRoleCssStyles($user);
                                 $topcoderStyles =$ratingCssClass.' '.$roleCssClass;
                                 $result = anchor(htmlspecialchars($name), userUrl($user), $topcoderStyles);
                             } else {

config/vanilla/config.php

@@ -10,6 +10,7 @@
 // Cache
 $Configuration['Cache']['Enabled'] = getenv('CACHE_ENABLED');
 $Configuration['Cache']['Method'] = getenv('CACHE_METHOD');
+$Configuration['Cache']['Memcached']['Store']=[getenv('MEMCACHED_SERVER')];
 
 // Conversations
 $Configuration['Conversations']['Version'] = '3.0';
@@ -144,8 +145,6 @@
 $Configuration['Vanilla']['EnableCategoryFollowing'] = true;
 $Configuration['Vanilla']['Version'] = '3.0';
 
-// memcached
-$Configuration['memcached']['Store'] = getenv('MEMCACHED_SERVER');
 
 // Initial setup config
 

docker-compose.dev.yml

@@ -12,4 +12,10 @@ services:
     command: --default-authentication-plugin=mysql_native_password
   vanilla-forums:
     links:
-      - mysql-local
+      - mysql-local
+      - memcached-local
+  memcached-local:
+    image: memcached:1.5
+    container_name: memcached-local
+    ports:
+      - "11211:11211"

vanilla/applications/dashboard/models/class.usermodel.php

@@ -1301,28 +1301,29 @@ public function get($orderFields = '', $orderDirection = 'asc', $limit = false,
      * @param string $username The username of the user.
      * @return bool|object Returns the user or **false** if they don't exist.
      */
-    public function getByUsername($username) {
+    public function getByUsername($username, $useCache = true) {
         if ($username == '') {
             return false;
         }
 
-        // Check page cache, then memcached
-        $user = $this->getUserFromCache($username, 'name');
-
-        if ($user === Gdn_Cache::CACHEOP_FAILURE) {
+        if($useCache === false ){
             $this->userQuery();
             $user = $this->SQL->where('u.Name', $username)->get()->firstRow(DATASET_TYPE_ARRAY);
-            if ($user) {
-                // If success, cache user
-                $this->userCache($user);
+        } else {
+            // Check page cache, then memcached
+            $user = $this->getUserFromCache($username, 'name');
+            if ($user === Gdn_Cache::CACHEOP_FAILURE) {
+                $this->userQuery();
+                $user = $this->SQL->where('u.Name', $username)->get()->firstRow(DATASET_TYPE_ARRAY);
             }
         }
 
-        // Apply calculated fields
-        $this->setCalculatedFields($user);
-
         // By default, firstRow() gives stdClass
         if ($user !== false) {
+            // If success, cache user
+            $this->userCache($user);
+            // Apply calculated fields
+            $this->setCalculatedFields($user);
             $user = (object)$user;
         }
 

vanilla/applications/vanilla/views/discussions/helper_functions.php

@@ -130,7 +130,7 @@ function writeDiscussion($discussion, $sender, $session) {
 
         $first = userBuilder($discussion, 'First');
         $last = userBuilder($discussion, 'LastDiscussionComments');
-        $lastDate = $discussion->LastDiscussionComments;
+        $lastDate = val('LastDiscussionComments', $discussion);
         $sender->EventArguments['FirstUser'] = &$first;
         $sender->EventArguments['LastUser'] = &$last;