Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop

Conflicts:
  config/general.yml-example

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index 6eb64b4b0..f06cf6312 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -86,12 +86,10 @@ namespace :themes do
     desc "Install themes specified in the config file's THEME_URLS"
     task :install => :environment do
         verbose = true
-        theme_urls = MySociety::Config.get("THEME_URLS", [])
-        theme_urls.each{ |theme_url| install_theme(theme_url, verbose) }
-        theme_url = MySociety::Config.get("THEME_URL", "")
-        if ! theme_url.blank?
+        Configuration::theme_urls.each{ |theme_url| install_theme(theme_url, verbose) }
+        if ! Configuration::theme_url.blank?
             # Old version of the above, for backwards compatibility
-            install_theme(theme_url, verbose, deprecated=true)
+            install_theme(Configuration::theme_url, verbose, deprecated=true)
         end
     end
 end
\ No newline at end of file