From: Tom Hughes <tom@compton.nu>
Date: Fri, 25 Apr 2008 09:04:56 +0000 (+0000)
Subject: Unbreak Richard's warning messages. Closes #864.
X-Git-Tag: live~8854
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/15e64474e4f16e36a5cfae9d1baa7be71da9ddc1?ds=sidebyside;hp=-c

Unbreak Richard's warning messages. Closes #864.
---

15e64474e4f16e36a5cfae9d1baa7be71da9ddc1
diff --git a/app/views/trace/_trace_header.rhtml b/app/views/trace/_trace_header.rhtml
index 8fdd8de7e..b4ef3f612 100644
--- a/app/views/trace/_trace_header.rhtml
+++ b/app/views/trace/_trace_header.rhtml
@@ -15,12 +15,10 @@
   <% end %>
 </p>
 
-<% if @display_name %>
-  <% if @user.traces.count(:conditions => "inserted=0") > 4 %>
-    <p>
-      You have <%= @user.traces.count(:conditions => "inserted=0") %> traces 
-      waiting for upload. Please consider waiting for these to finish before 
-      uploading any more, so as not to block the queue for other users.
-    </p>
-  <% end %>
+<% if @user and @user.traces.count(:conditions => "inserted=0") > 4 %>
+  <p>
+    You have <%= @user.traces.count(:conditions => "inserted=0") %> traces 
+    waiting for upload. Please consider waiting for these to finish before 
+    uploading any more, so as not to block the queue for other users.
+  </p>
 <% end %>