developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt 

Conflicts:
	app/models/item.rb
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/news/app/models/news_bulletin.rb
This commit is contained in:
Christophe Vilayphiou 2012-08-08 14:48:29 +08:00
parent e8317e0a4b fe4aadef29
commit 959def6c1f
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/built_in_modules/announcement/app/models/bulletin.rb vendored
View File

@ -106,7 +106,6 @@ class Bulletin
self.save!
end
def enabled_for_lang(lang)
eval("self.available_for_#{lang}")
end

1
vendor/built_in_modules/news/app/models/news_bulletin.rb vendored
View File

@ -166,7 +166,6 @@ class NewsBulletin
end
end
def enabled_for_lang(lang)
eval("self.available_for_#{lang}")
end