Modified: trunk/app/controllers/application_controller.rb (3473 => 3474)
--- trunk/app/controllers/application_controller.rb 2013-03-07 12:06:12 UTC (rev 3473)
+++ trunk/app/controllers/application_controller.rb 2013-03-07 13:40:48 UTC (rev 3474)
@@ -551,15 +551,12 @@
layout = Conf.layouts[params["layout_preview"]]
elsif contributable && contributable.contribution && contributable.contribution.policy
layout = Conf.layouts[contributable.contribution.policy.layout]
- if layout.nil?
+ if contributable.contribution.policy.layout && layout.nil?
logger.error("Missing layout for #{contributable.class.name} #{contributable.id}: "+
"#{contributable.contribution.policy.layout}")
end
elsif (network = @network) || (@context.is_a?(Network) && (network = @context))
layout = network.layout
- if layout.nil?
- logger.error("Missing layout for Group #{network.id}")
- end
end
@layout = layout || {"layout" => 'application', "stylesheets" => [Conf.stylesheet]}