Merge branch 'hotfix/0.39.1.3'

app/models/survey.rb

@@ -25,11 +25,14 @@ def initialize(public_body)
   def url
     return Survey.url if user_too_identifiable?
 
-    Addressable::URI.parse(Survey.url).tap do |url|
-      url.query_values = (url.query_values || {}).merge(
-        authority_id: public_body.to_param
-      )
-    end.to_s
+    uri = URI(Survey.url)
+
+    new_query = Hash[URI.decode_www_form(uri.query.to_s)].merge(
+      authority_id: public_body.to_param
+    )
+    uri.query = URI.encode_www_form(new_query)
+
+    uri.to_s
   end
 
   protected

config/initializers/alaveteli.rb

@@ -10,7 +10,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.39.1.2'
+ALAVETELI_VERSION = '0.39.1.3'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

doc/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.39.1.3
+
+## Highlighted Features
+
+* Fix broken alert-survey script (Graeme Porteous)
+
 # 0.39.1.2
 
 ## Highlighted Features