Merge branch 'master' into rails3

refinery · Aug 19, 2010 · f543cf3 · f543cf3
2 parents 3a73874 + 7208c94
commit f543cf3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/vendor/refinerycms/core/app/views/shared/_menu.html.erb b/vendor/refinerycms/core/app/views/shared/_menu.html.erb
@@ -12,7 +12,7 @@
           <%= render :partial => "/shared/menu_branch",
                      :collection => collection,
                      :locals => {
-                       :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
+                       :hide_children => hide_children ||= RefinerySetting.find_or_set(:menu_hide_children, false),
                        :sibling_count => collection.size - 1
                      }
           -%>