Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/models/user_score.rb

@@ -122,8 +122,8 @@ class UserScore < ActiveRecord::Base
       Rails.logger.error "[UserScore#influence] ===> #{operate} is not define."
       return false
     end
-  #rescue => e
+  rescue => e
-    #Rails.logger.error "[UserScore#influence] ===> Exception: #{e}."
+    Rails.logger.error "[UserScore#influence] ===> Exception: #{e}."
   end
 
   # 前略·技术得分

app/views/layouts/_base_footer.html.erb

@@ -1,4 +1,5 @@
 <!--add by huang-->
+<% cache "footer" do %>
 <div class="clearfix"></div>
 <div id="footer" style="margin-left:-5px;padding-top: 20px;clear: both;font-size: 12px;">
 	<div style="border-top:solid 1px #C6E9F1;"></div>
@@ -44,3 +45,5 @@
 
   </script>
 </div>
+
+<% end %>