tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

API CHANGE: column names escaped

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72425 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Geoff Munn 2009-03-03 21:43:47 +00:00
parent 55ba6f6cfa
commit 75b1484fca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/CMSMain.php
View File

@ -620,7 +620,7 @@ JS;
if(Director::is_ajax()) { if(Director::is_ajax()) {
// need a valid ID value even if the record doesn't have one in the database // need a valid ID value even if the record doesn't have one in the database
// (its still present in the live tables) // (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 the page has never been published to live, we need to act the same way as in deletefromlive()
if($liveRecord) { if($liveRecord) {
// the form is readonly now, so we need to refresh the representation // the form is readonly now, so we need to refresh the representation
@ -663,7 +663,7 @@ JS;
$pageID = $this->urlParams['ID']; $pageID = $this->urlParams['ID'];
$page = $this->getRecord($pageID); $page = $this->getRecord($pageID);
if($page) { if($page) {
$versions = $page->allVersions($_REQUEST['unpublished'] ? "" : "\"SiteTree\".WasPublished = 1"); $versions = $page->allVersions($_REQUEST['unpublished'] ? "" : "\"SiteTree\".\"WasPublished\" = 1");
return array( return array(
'Versions' => $versions, 'Versions' => $versions,
); );

2
code/SideReport.php
View File

@ -92,7 +92,7 @@ class SideReport_RecentlyEdited extends SideReport {
return _t('SideReport.LAST2WEEKS',"Pages edited in the last 2 weeks"); return _t('SideReport.LAST2WEEKS',"Pages edited in the last 2 weeks");
} }
function records() { 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() { function fieldsToShow() {
return array( return array(