tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG FIX: column names quoted properly (from r100690)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105621 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-05-25 04:22:50 +00:00
parent 96ebc35cee
commit 0a91f30722
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/model/SiteTree.php
View File

@ -2044,7 +2044,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
static function generate_homepage_domain_map() { 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; if (!$domainSpecificHomepages) return false;
$map = array(); $map = array();

4
core/model/VirtualPage.php
View File

@ -149,8 +149,8 @@ class VirtualPage extends Page {
&& Versioned::current_stage() == 'Live') { && Versioned::current_stage() == 'Live') {
$performCopyFrom = true; $performCopyFrom = true;
$stageSourceVersion = DB::query("SELECT Version FROM SiteTree 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(); $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 // 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 // version might not exist, unless we're publishing the latest version