developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
Christophe Vilayphiou 2012-05-04 16:12:28 +08:00
parent 3bd3820519
commit 15bc4d4268
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -96,8 +96,8 @@ module ApplicationHelper
((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil ((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil
end end
def process_page(page, id) def process_page(page, id, params)
parse_page_noko(page, id) parse_page_noko(page, id, params)
end end
def page_metas(page) def page_metas(page)