jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
cxt 2016-02-02 18:13:15 +08:00
parent b761505669 eed6250145
commit 4dd1c23c81
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/initializers/subdomain.rb
View File

@ -6,7 +6,7 @@ class Subdomain
def matches?(request) def matches?(request)
puts request.path_parameters puts request.path_parameters
o = Secdomain.where(subname: request.subdomain).first o = ::Secdomain.where(subname: request.subdomain).first
if(@opt[:sub]) if(@opt[:sub])
if o && o.sub_type == 2 && request.path_parameters[:sub_dir_name] == 'news' if o && o.sub_type == 2 && request.path_parameters[:sub_dir_name] == 'news'