From 75b1484fcab3dfcb9a325c6e05998fad6064636f Mon Sep 17 00:00:00 2001 From: Geoff Munn Date: Tue, 3 Mar 2009 21:43:47 +0000 Subject: [PATCH] API CHANGE: column names escaped git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72425 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 4 ++-- code/SideReport.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 735ab244..a3366306 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -620,7 +620,7 @@ JS; if(Director::is_ajax()) { // need a valid ID value even if the record doesn't have one in the database // (its still present in the live tables) - $liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "SiteTree_Live.ID = $recordID"); + $liveRecord = Versioned::get_one_by_stage('SiteTree', 'Live', "\"SiteTree_Live\".\"ID\" = $recordID"); // if the page has never been published to live, we need to act the same way as in deletefromlive() if($liveRecord) { // the form is readonly now, so we need to refresh the representation @@ -663,7 +663,7 @@ JS; $pageID = $this->urlParams['ID']; $page = $this->getRecord($pageID); if($page) { - $versions = $page->allVersions($_REQUEST['unpublished'] ? "" : "\"SiteTree\".WasPublished = 1"); + $versions = $page->allVersions($_REQUEST['unpublished'] ? "" : "\"SiteTree\".\"WasPublished\" = 1"); return array( 'Versions' => $versions, ); diff --git a/code/SideReport.php b/code/SideReport.php index fd45cdcb..beb57cc2 100755 --- a/code/SideReport.php +++ b/code/SideReport.php @@ -92,7 +92,7 @@ class SideReport_RecentlyEdited extends SideReport { return _t('SideReport.LAST2WEEKS',"Pages edited in the last 2 weeks"); } function records() { - return DataObject::get("SiteTree", "\"SiteTree\".\"LastEdited\" > NOW() - INTERVAL 14 DAY", "\"SiteTree\".\"LastEdited\" DESC"); + return DataObject::get("SiteTree", "\"SiteTree\".\"LastEdited\" > NOW() - INTERVAL '14 DAY'", "\"SiteTree\".\"LastEdited\" DESC"); } function fieldsToShow() { return array(