From 0796a2b6821e75e22ec6eacd3950ef916b16303d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 3 May 2019 19:43:00 +0100
Subject: 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).
---
 perllib/FixMyStreet/DB/ResultSet/Problem.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perllib/FixMyStreet/DB/ResultSet/Problem.pm')

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\')',
-- 
cgit v1.2.3