[myexperiment-hackers] [2900] trunk/lib/conf.rb: Fixed nil layout error, added a log entry when a layout doesn't exist

[noreply]

Revision

2900

Author

fbacall

Date

2012-01-17 04:58:16 -0500 (Tue, 17 Jan 2012)

Log Message

Fixed nil layout error, added a log entry when a layout doesn't exist

Modified Paths

• trunk/lib/conf.rb

Diff

Modified: trunk/lib/conf.rb (2899 => 2900)

--- trunk/lib/conf.rb	2012-01-16 15:16:17 UTC (rev 2899)
+++ trunk/lib/conf.rb	2012-01-17 09:58:16 UTC (rev 2900)
@@ -179,8 +179,8 @@
 
   def self.layouts
     #TODO: Perhaps implement code that can load different/extra settings files based on current environment
-    layouts = self.fetch_entry('layouts')
-    layouts ? layouts.delete_if {|k,v| v["environment"] && (v["environment"] != ENV["RAILS_ENV"])} : {}
+    layouts = self.fetch_entry('layouts') || {}
+    layouts.delete_if {|k,v| v["environment"] && (v["environment"] != ENV["RAILS_ENV"])}
   end
 
   # This method is required to create an administrator in the test fixtures