Merge branch 'master' into openstreetbugs

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 38091861a9e651ceb2dab9370b6987a52beb9e6d..29ab4535a1f399b8c5fe7fa1325adf9c635b1b11 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -210,7 +210,7 @@ module Potlatch
         }
       end
 
         }
       end
 

-      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,nil,icon_tags]
+      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,{},icon_tags]

     end
   end
 
     end
   end