# HG changeset patch
# User Chris Cannam
# Date 1358940264 0
# Node ID 9ad0d37a49c9cf2c6cce30e59f6c005d60f58084
# Parent  6a7198536816af8462cea7b83f3538190a9669dc# Parent  fc5d582a25f94a627aa7f0c92ccb5da3232ffefc
Merge from branch "live"

diff -r 6a7198536816 -r 9ad0d37a49c9 app/views/layouts/base.html.erb
--- a/app/views/layouts/base.html.erb	Wed Jan 23 11:08:10 2013 +0000
+++ b/app/views/layouts/base.html.erb	Wed Jan 23 11:24:24 2013 +0000
@@ -64,7 +64,7 @@
       <% unless page_header_title[1].empty? %>
         style="margin-top: 0px; "
       <% end %>  
-      <% if @project.name.length > 35 %>
+      <% if !@project.nil? and @project.name.length > 35 %>
         class="long-title"
       <% end %>
     ><% if display_main_menu?(@project) %>