diff options
author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-03 19:43:00 +0100 |
---|---|---|
committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-13 11:53:24 +0100 |
commit | 0796a2b6821e75e22ec6eacd3950ef916b16303d (patch) | |
tree | b37dfe49b5cfbd1be9528bc8ed9fa5667b1be7d0 /perllib/FixMyStreet/DB/ResultSet/Problem.pm | |
parent | c65c2bc48abce71bca97079ffdb7aa39d5b7e8ed (diff) |
Update a number of packages.
Update:
* Catalyst
* Specify Catalyst::DispatchType::Regex explicitly
* Remove Catalyst::Plugin::Unicode::Encoding
* Catalyst::Plugin::SmartURI
* Specify URI::SmartURI explicitly
* Catalyst::Plugin::Static::Simple
* CGI
* Class::Load
* DateTime
* DateTime::TimeZone
* DBD::Pg
* DBIx::Class
* DBIx::Class::EncodedColumn.
* Email::Address.
* Email::MIME
* ExtUtils::MakeMaker
* ExtUtils::ParseXS (for Params::Classify upgrade)
* File::ChangeNotify
* Image::Size
* IO::Socket::SSL
* local::lib
* Moo
* Moose (and some related others due to deprecations)
* namespace::autoclean
* Net::Server
* Net::SSLeay
* Number::Phone
* Plack
* Starman
* Template
* Test::PostgreSQL
* Test::WWW::Mechanize::Catalyst
* Text::CSV
* YAML
carton install was run on a wheezy box, the oldest that is supported, to
make sure the required minimal vesions of core modules weren't removed
from the snapshot. Cpanel::JSON::XS, Devel::GlobalDestruction::XS, and
MooseX::NonMoose were then put back in the snapshot, in case another
system needs them (e.g. system Perl on Mac looks for MooseX::NonMoose).
Diffstat (limited to 'perllib/FixMyStreet/DB/ResultSet/Problem.pm')
-rw-r--r-- | perllib/FixMyStreet/DB/ResultSet/Problem.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index 37fc34057..dae946816 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -273,7 +273,7 @@ sub categories_summary { sub include_comment_counts { my $rs = shift; my $order_by = $rs->{attrs}{order_by}; - return $rs unless ref $order_by eq 'HASH' && $order_by->{-desc} eq 'comment_count'; + return $rs unless ref $order_by eq 'ARRAY' && ref $order_by->[0] eq 'HASH' && $order_by->[0]->{-desc} eq 'comment_count'; $rs->search({}, { '+select' => [ { "" => \'(select count(*) from comment where problem_id=me.id and state=\'confirmed\')', |