From 802c0ea565b563e2d9f385b003db298ee2c4d83c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 15 Oct 2014 11:31:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9C=AA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E8=84=9A=E6=97=B6=E8=BF=9B=E5=85=A5=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 +-
 app/views/layouts/_base_footer.html.erb   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 91e2959ef..b470e4933 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -763,7 +763,7 @@ class ApplicationController < ActionController::Base
   end
 
   def find_web_footer
-    @organizer = WebFooterOrganizer.first
+    @organize = WebFooterOranizer.first
     @companies = WebFooterCompany.all
   end
 end
diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index 3509276c7..cfe950eae 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -10,8 +10,10 @@
     <%= @organize.description.html_safe unless @organize.nil?%>
   </p>
   <div id="logo_link">
-    <% @companys.each do |company| %>
-        <span class="footer_logo_link"><%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %></span>
+    <% unless @companys.nil?%>
+        <% @companys.each do |company| %>
+            <span class="footer_logo_link"><%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %></span>
+        <% end %>
     <% end %>
  </div>
  <!--gcm-->