From 65a35d92fc32215e7c9dd32aa7dc406be437995b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 28 May 2010 02:30:40 +0000 Subject: [PATCH] MINOR using better sorting api (from r96483) (from r98197) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105841 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/reports/BrokenLinksReport.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/reports/BrokenLinksReport.php b/code/reports/BrokenLinksReport.php index ba9443bc..ed898216 100644 --- a/code/reports/BrokenLinksReport.php +++ b/code/reports/BrokenLinksReport.php @@ -11,9 +11,8 @@ class BrokenLinksReport extends SS_Report { return _t('BrokenLinksReport.BROKENLINKS',"Broken links report"); } function sourceRecords($params, $sort, $limit) { - if(!$sort || !in_array(preg_replace('/(\s+?)(A|DE)SC$/', '', $sort), array('Title','LastEdited'))) $sort = "LastEdited ASC"; - if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)", $sort); - else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)", $sort); + if (!isset($_REQUEST['CheckSite']) || $params['CheckSite'] == 'Published') $ret = Versioned::get_by_stage('SiteTree', 'Live', "(HasBrokenLink = 1 OR HasBrokenFile = 1)"); + else $ret = DataObject::get('SiteTree', "(HasBrokenFile = 1 OR HasBrokenLink = 1)"); $returnSet = new DataObjectSet(); if ($ret) foreach($ret as $record) { @@ -51,6 +50,8 @@ class BrokenLinksReport extends SS_Report { } } + if ($sort) $returnSet->sort($sort); + return $returnSet; } function columns() {