fixes

app/controllers/application_controller.rb

@@ -40,15 +40,15 @@
   
 
 def get_theme
-  if params[:theme]== "default" || params[:theme]=="2003"
-    params[:theme]="blue1"
-    end
-  if ThemesForRails.available_theme_names.include?(params[:theme])
-  params[:theme]
+#  if params[:theme]== "default" || params[:theme]=="2003"
+#    params[:theme]="blue1"
+#    end
+#  if ThemesForRails.available_theme_names.include?(params[:theme])
+#  params[:theme]
  
-else
+#else
 "blue1"
-end
+#end
 end
   def default_url_options
     {locale: I18n.locale, theme: (theme_name=="blue1") ? "default" : theme_name , ansicht: nil}

app/views/gremien/show.html.erb

@@ -25,7 +25,7 @@
   <% @memberships.each_slice(4) do |r| %>
   <div class="row-fluid">
     <% r.each do |m| %>
-    <% cache("member_"+ m.id.to_s+"_portrait"+[m.updated_at m.fetprofile.updated_at].max.utc.to_s) do %>
+    <% cache(("member_" + m.id.to_s + "_portrait" + ([m.updated_at, m.try(:fetprofile).try(:updated_at)].max.utc.to_s))) do %>
     <%= link_to m.fetprofile do %>
     <div class="span3" style="vertical-align:middle; text-align:center" itemprop="hasmember" itemscope itemtype="http://schema.org/Person">
       <%= image_tag m.fetprofile.try(:picture).try(:portrait) %>

app/views/memberships/_membership.html.erb

@@ -2,7 +2,7 @@
 <%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %>
 <%=membership.start.to_s %> 
 <%= " "+I18n.t("gremium.bis")+" "+membership.stop.to_s unless membership.stop.nil? %> 
-<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %>  <meta itemprop="name" content="<%= membership.gremium.name"/><span >
+<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %>  <meta itemprop="name" content="<%= membership.gremium.name %>"/><span >
 <%= membership.gremium.fall2 %></span>
 <meta itemprop="sameAs" content="<%= gremium_path(membership.gremium, :theme=>nil)%>"/>
 </span>