diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
| commit | eb823376088f47abf23050a0193225a45b51d6d3 (patch) | |
| tree | a6eb5fc8cf694a7dd70d7d1a957d65ec09a6c60a /perllib | |
| parent | bc39723b98a0bb07cc8d57e99489e3a014d857ef (diff) | |
| parent | 7fc1083eb431312a59758c473e8ff52ceb8585ef (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts:
templates/web/default/common_header_tags.html
Diffstat (limited to 'perllib')
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Rss.pm | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/View/Web.pm | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 3a7ffa19a..767d38c21 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -265,8 +265,8 @@ sub add_row : Private { } if ( $row->{used_map} ) { - my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude} ); - $item{description} .= ent("\n<br>$address"); + #my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude} ); + #$item{description} .= ent("\n<br>$address"); } my $recipient_name = $c->cobrand->contact_name; diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index 5579d0d53..43d46ae25 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -19,7 +19,7 @@ __PACKAGE__->config( render_die => 1, expose_methods => [ 'loc', 'nget', 'tprintf', 'display_crosssell_advert', 'prettify_epoch', - 'add_links', + 'add_links', 'version', ], FILTERS => { escape_js => \&escape_js, @@ -165,5 +165,15 @@ sub html_filter { return $text; } +my %version_hash; +sub version { + my ( $self, $c, $file ) = @_; + unless ($version_hash{$file}) { + my $path = FixMyStreet->path_to('web', $file); + $version_hash{$file} = ( stat( $path ) )[9]; + } + return "$file?$version_hash{$file}"; +} + 1; |