diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-09-04 16:25:22 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-09-04 16:25:22 +0100 |
| commit | 88a17a01a4353ed700067d36bb0e4f45ad5348d3 (patch) | |
| tree | a543fab9a0b9058397f2ae2b040d306efe026331 | |
| parent | 9839e0e23ba78b405779b1a9c9d1e41f02991ebd (diff) | |
| parent | 527f577fcec629e3a39072a144ef96d31b193f8b (diff) | |
Merge branch 'develop' of github.com:mysociety/alaveteli into develop
| -rw-r--r-- | app/models/public_body.rb | 2 | ||||
| -rw-r--r-- | spec/models/public_body_spec.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 60ecb2781..fb30da234 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -104,7 +104,7 @@ class PublicBody < ActiveRecord::Base locale = self.locale || I18n.locale PublicBody.with_locale(locale) do found = PublicBody.find(:all, - :conditions => ["public_body_translations.url_name='#{name}'"], + :conditions => ["public_body_translations.url_name=?", name], :joins => :translations, :readonly => false) # If many bodies are found (usually because the url_name is the same across diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 8ff6afde3..9e22a9c43 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -222,6 +222,10 @@ describe PublicBody, "when searching" do body.name.should == "El A Geraldine Quango" end end + + it 'should not raise an error on a name with a single quote in it' do + body = PublicBody.find_by_url_name_with_historic("belfast city council'") + end end describe PublicBody, " when dealing public body locales" do |