Revert r18163 as it is completely broken.

[rails.git] / app / controllers / amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 64abdb25785116632dab53bcdf2f8ba326a7551d..687262e749b3ee21953edae898b7c34e45156c87 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -232,12 +232,6 @@ class AmfController < ApplicationController
     help = localised["help_html"]
     localised.delete("help_html")
 
-    # Populate icon names
-    POTLATCH_PRESETS[10].each { |id|
-      POTLATCH_PRESETS[11][id] = localised["preset_icon_#{id}"]
-      localised.delete("preset_icon_#{id}")
-    }
-
     return POTLATCH_PRESETS+[localised,help]
   end
 
@@ -249,7 +243,7 @@ class AmfController < ApplicationController
     en = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/locales/en.yml"))["en"]
 
     if lang == 'en'
-      return [real_lang, en]
+      return [loaded_lang, en]
     else
       # Use English as a fallback
       begin