Merge branch 'next_stable' of github.com:magiclabs/alchemy_cms into n…

…ext_stable
AlchemyCMS · Oct 31, 2011 · 9c9833a · 9c9833a
2 parents 62875e7 + a04df11
commit 9c9833a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/helpers/elements_helper.rb b/app/helpers/elements_helper.rb
@@ -53,7 +53,7 @@ def render_elements(options = {})
       element_string = ""
       if options[:fallback]
         unless all_elements.detect { |e| e.name == options[:fallback][:for] }
-          if from = Page.find_by_page_layout(options[:fallback][:from])
+          if from = Page.find_by_page_layout_and_language_id(options[:fallback][:from], session[:language_id])
             all_elements += from.elements.find_all_by_name(options[:fallback][:with].blank? ? options[:fallback][:for] : options[:fallback][:with])
           end
         end