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
2012-08-08 14:48:29 +08:00 · 2012-08-08 14:48:29 +08:00 · 959def6c1f
parent e8317e0a4b fe4aadef29
commit 959def6c1f
2 changed files with 0 additions and 2 deletions
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@ -106,7 +106,6 @@ class Bulletin
    self.save!
  end

-
  def enabled_for_lang(lang)
    eval("self.available_for_#{lang}")
  end
--- a/vendor/built_in_modules/news/app/models/news_bulletin.rb
+++ b/vendor/built_in_modules/news/app/models/news_bulletin.rb
@ -166,7 +166,6 @@ class NewsBulletin
      end
  end

-  def enabled_for_lang(lang)
    eval("self.available_for_#{lang}")
  end