diff options
| author | Mark Longair <mhl@pobox.com> | 2013-10-30 10:12:02 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-10-30 10:12:02 +0000 |
| commit | 95a92efe385ebe21b8f31424f2cef86ea9c9455d (patch) | |
| tree | c7d2530cf615cedc70cb463a9bc0f1c0c4de6729 /config/initializers/theme_loader.rb | |
| parent | 5964dc79a0e6608529ccf610460d1928811e8ef0 (diff) | |
| parent | 5aed12997b6d8950e20b1620fd643256ca56f818 (diff) | |
Merge branch 'switch-theme-script' into rails-3-develop
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'config/initializers/theme_loader.rb')
| -rw-r--r-- | config/initializers/theme_loader.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/initializers/theme_loader.rb b/config/initializers/theme_loader.rb index 1ad2d01f1..b3ae11e1e 100644 --- a/config/initializers/theme_loader.rb +++ b/config/initializers/theme_loader.rb @@ -18,7 +18,6 @@ if Rails.env == "test" end else for url in AlaveteliConfiguration::theme_urls.reverse - theme_name = url.sub(/.*\/(.*).git/, "\\1") - require_theme(theme_name) + require_theme theme_url_to_theme_name(url) end end |