diff options
| author | Marius Halden <marius.h@lden.org> | 2016-03-28 20:38:28 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-03-28 20:38:28 +0200 |
| commit | 6c1118dbf2c4b15bcfcd77600d36f2389428c75e (patch) | |
| tree | da81756a344a89502df5479b860b6f4a24b6ed92 /perllib/FixMyStreet/App/Controller/Rss.pm | |
| parent | a2d67ca6de255ff04badb7cb5a62f7d3df3ce293 (diff) | |
| parent | 4345263c9de752454795ad57323e684e41e702a8 (diff) | |
Merge tag 'v1.8.1' into fiksgatami-dev
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Rss.pm')
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Rss.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index b817fe326..6047f063b 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -218,7 +218,7 @@ sub query_main : Private { . ($alert_type->head_table ? $alert_type->head_table . '_id=? and ' : '') . $alert_type->item_where . ' order by ' . $alert_type->item_order; - my $rss_limit = mySociety::Config::get('RSS_LIMIT'); + my $rss_limit = FixMyStreet->config('RSS_LIMIT'); $query .= " limit $rss_limit" unless $c->stash->{type} =~ /^all/; my $q = $c->model('DB::Alert')->result_source->storage->dbh->prepare($query); @@ -260,9 +260,9 @@ sub add_row : Private { $row->{confirmed} =~ s/^(\d+)/ordinal($1)/e if $c->stash->{lang_code} eq 'en-gb'; } - (my $title = _($alert_type->item_title)) =~ s/{{(.*?)}}/$row->{$1}/g; - (my $link = $alert_type->item_link) =~ s/{{(.*?)}}/$row->{$1}/g; - (my $desc = _($alert_type->item_description)) =~ s/{{(.*?)}}/$row->{$1}/g; + (my $title = _($alert_type->item_title)) =~ s/\{\{(.*?)}}/$row->{$1}/g; + (my $link = $alert_type->item_link) =~ s/\{\{(.*?)}}/$row->{$1}/g; + (my $desc = _($alert_type->item_description)) =~ s/\{\{(.*?)}}/$row->{$1}/g; my $base_url = $c->cobrand->base_url_for_report($row); my $url = $base_url . $link; @@ -317,9 +317,9 @@ sub add_parameters : Private { $row->{$_} = $c->stash->{title_params}->{$_}; } - (my $title = _($alert_type->head_title)) =~ s/{{(.*?)}}/$row->{$1}/g; - (my $link = $alert_type->head_link) =~ s/{{(.*?)}}/$row->{$1}/g; - (my $desc = _($alert_type->head_description)) =~ s/{{(.*?)}}/$row->{$1}/g; + (my $title = _($alert_type->head_title)) =~ s/\{\{(.*?)}}/$row->{$1}/g; + (my $link = $alert_type->head_link) =~ s/\{\{(.*?)}}/$row->{$1}/g; + (my $desc = _($alert_type->head_description)) =~ s/\{\{(.*?)}}/$row->{$1}/g; $c->stash->{rss}->channel( title => ent($title), |