From 6db98f52d6970173dd5b0afaaa2aa4216e2ea1cc Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 13 Aug 2015 17:32:12 -0400
Subject: [PATCH] FIX: Regression with suspended text

---
 .../admin/templates/{user_index.hbs => user-index.hbs}      | 6 +++---
 app/assets/javascripts/discourse/templates/user/user.hbs    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename app/assets/javascripts/admin/templates/{user_index.hbs => user-index.hbs} (98%)

diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
similarity index 98%
rename from app/assets/javascripts/admin/templates/user_index.hbs
rename to app/assets/javascripts/admin/templates/user-index.hbs
index 302db5f4d0..60d888a416 100644
--- a/app/assets/javascripts/admin/templates/user_index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -306,12 +306,12 @@
     <div class='display-row highlight-danger'>
       <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
       <div class='value'>
-        {{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}}
-        {{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}}
+        {{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
+        {{#link-to 'adminUser' suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
       </div>
       <div class='controls'>
         <b>{{i18n 'admin.user.suspend_reason'}}</b>:
-        {{suspend_reason}}
+        {{model.suspend_reason}}
       </div>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 7ba76ca75f..36ced927f2 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -77,8 +77,8 @@
               {{#if model.isSuspended}}
                 <div class='suspended'>
                   {{fa-icon "ban"}}
-                  <b>{{i18n 'user.suspended_notice' date=suspendedTillDate}}</b><br/>
-                  <b>{{i18n 'user.suspended_reason'}}</b> {{suspend_reason}}
+                  <b>{{i18n 'user.suspended_notice' date=model.suspendedTillDate}}</b><br/>
+                  <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
                 </div>
               {{/if}}
               {{{model.bio_cooked}}}