diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm')
| -rw-r--r-- | perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm index 753eb2084..bbf0c9a9e 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm @@ -85,7 +85,7 @@ sub send_questionnaires_period { scope => 'questionnaire', data => $questionnaire->id, } ); - $h{url} = $cobrand->base_url_for_emails($row->cobrand_data) . '/Q/' . $token->token; + $h{url} = $cobrand->base_url($row->cobrand_data) . '/Q/' . $token->token; my $sender = $cobrand->contact_email; my $sender_name = _($cobrand->contact_name); |