themes fixes and versioning small fix

2014-01-22 12:33:45 +01:00
parent 783b9f41c9
commit eadc5d26b4
7 changed files with 25 additions and 17 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,4 @@
-class ApplicationController < ActionController::Base
+ class ApplicationController < ActionController::Base
  protect_from_forgery
  before_filter :set_i18n_locale_from_params
  protected
@@ -14,11 +14,11 @@ class ApplicationController < ActionController::Base
    end
  end
 def get_theme
-  set_theme(params[:theme])
-if valid_theme?
-theme_name
+  if ThemesForRails.available_theme_names.include?(params[:theme])
+  params[:theme]
+ 
 else
-nil
+"2003"
 end
 end
  def default_url_options