diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-04-04 12:24:03 +0100 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-04-04 12:24:03 +0100 |
| commit | 8fa7e52025478515203b39f3e7afafb829b60731 (patch) | |
| tree | 295fb14df87abc4577418cfd294931cc51f7c991 /web/alert.cgi | |
| parent | 689e4c3bd7c7c1cb24ecad3b35a57947bfb7945b (diff) | |
| parent | e591ef105c5996e95f2e7738b324c25b3708f0be (diff) | |
Merge branch 'master' into migrate_to_catalyst
Conflicts:
.gitignore
commonlib
conf/packages
perllib/FixMyStreet/Map.pm
templates/website/cobrands/barnet/footer
web/confirm.cgi
web/css/core.css
web/import.cgi
web/index.cgi
Diffstat (limited to 'web/alert.cgi')
| -rwxr-xr-x | web/alert.cgi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index dd4676644..208dc756b 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -364,7 +364,7 @@ sub alert_list_options { my $rss_url = Cobrand::url($cobrand, $url, $q); $out .= 'value="' . $id . '"> <label for="' . $id . '">' . $text . '</label> <a href="' . $rss_url . '"><img src="/i/feed.png" width="16" height="16" -title="' . sprintf(_('RSS feed of %s'), $text) . '" alt="' . _('RSS feed') . '" border="0"></a>'; +title="' . sprintf(_('RSS feed of %s'), $text) . '" alt="' . _('RSS feed') . '" border="0"></a></li>'; } return $out; } @@ -605,6 +605,6 @@ sub alert_do_subscribe { $h{url} = Page::base_url_with_lang($q, undef, 1) . '/A/' . mySociety::AuthToken::store('alert', { id => $alert_id, type => 'subscribe', email => $email } ); dbh()->commit(); - return Page::send_email($q, $email, undef, 'alert', %h); + return Page::send_confirmation_email($q, $email, undef, 'alert', %h); } |