diff options
| author | David Cabo <david@calibea.com> | 2011-08-12 13:12:50 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-12 13:12:50 +0200 |
| commit | df1754847892bb6abce2681a42d8c50cf8d3a2da (patch) | |
| tree | 73c518103906ad446cedd55c69690d8d91f0f362 /app/helpers/application_helper.rb | |
| parent | a63e598b9e0ddfa7ac695b1be41aaace6c0eb628 (diff) | |
| parent | 766df1c7de8f820bd6e451526787632a136bc635 (diff) | |
Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu
Conflicts:
locale/cy/app.po
locale/de/app.po
locale/es/app.po
locale/fr/app.po
locale/sq/app.po
locale/sr/app.po
locale/sr@latin/app.po
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9bdcb98cd..ec56566a9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -14,6 +14,9 @@ module ApplicationHelper # all of all. include LinkToHelper + # Site-wide access to configuration settings + include ConfigHelper + # Copied from error_messages_for in active_record_helper.rb def foi_error_messages_for(*params) options = params.last.is_a?(Hash) ? params.pop.symbolize_keys : {} @@ -45,7 +48,7 @@ module ApplicationHelper '' end end - + # Highlight words, also escapes HTML (other than spans that we add) def highlight_words(t, words, html = true) if html |