From 9ebabb17851ff966303fbdd98371a068f160fcb6 Mon Sep 17 00:00:00 2001 From: Geoff Munn Date: Tue, 9 Mar 2010 02:28:39 +0000 Subject: [PATCH] BUG FIX: column names quoted properly git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100690 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/SiteTree.php | 2 +- core/model/VirtualPage.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index 93814390c..186d6a129 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -2017,7 +2017,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid } static function generate_homepage_domain_map() { - $domainSpecificHomepages = Versioned::get_by_stage('Page', 'Live', "HomepageForDomain != ''", 'URLSegment ASC'); + $domainSpecificHomepages = Versioned::get_by_stage('Page', 'Live', "\"HomepageForDomain\" != ''", "\"URLSegment\" ASC"); if (!$domainSpecificHomepages) return false; $map = array(); diff --git a/core/model/VirtualPage.php b/core/model/VirtualPage.php index 48264708b..b5186dadd 100755 --- a/core/model/VirtualPage.php +++ b/core/model/VirtualPage.php @@ -149,8 +149,8 @@ class VirtualPage extends Page { && Versioned::current_stage() == 'Live') { $performCopyFrom = true; - $stageSourceVersion = DB::query("SELECT Version FROM SiteTree WHERE ID = $this->CopyContentFromID")->value(); - $liveSourceVersion = DB::query("SELECT Version FROM SiteTree_Live WHERE ID = $this->CopyContentFromID")->value(); + $stageSourceVersion = DB::query("SELECT \"Version\" FROM \"SiteTree\" WHERE \"ID\" = $this->CopyContentFromID")->value(); + $liveSourceVersion = DB::query("SELECT \"Version\" FROM \"SiteTree_Live\" WHERE \"ID\" = $this->CopyContentFromID")->value(); // We're going to create a new VP record in SiteTree_versions because the published // version might not exist, unless we're publishing the latest version