Merge branch 'szzh' into develop

2016-02-02 18:13:15 +08:00 · 2016-02-02 18:13:15 +08:00 · 4dd1c23c81
parent b761505669 eed6250145
commit 4dd1c23c81
1 changed files with 1 additions and 1 deletions
--- a/config/initializers/subdomain.rb
+++ b/config/initializers/subdomain.rb
@ -6,7 +6,7 @@ class Subdomain

  def matches?(request)
    puts request.path_parameters
-    o = Secdomain.where(subname: request.subdomain).first
+    o = ::Secdomain.where(subname: request.subdomain).first

    if(@opt[:sub])
      if o && o.sub_type == 2 && request.path_parameters[:sub_dir_name] == 'news'