Merge pull request #451 from cjsewell/2

Fix "Column 'URLSegment' in where clause is ambiguous" when duplicating pages
This commit is contained in:
Dylan Wagstaff 2020-01-22 09:01:17 +13:00 committed by GitHub
commit fd10b868ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions

View File

@ -484,14 +484,10 @@ class SiteTreeSubsites extends DataExtension
$origDisableSubsiteFilter = Subsite::$disable_subsite_filter; $origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
Subsite::disable_subsite_filter(true); Subsite::disable_subsite_filter(true);
$candidatePage = DataObject::get_one( $candidatePage = SiteTree::get()->filter([
SiteTree::class, 'URLSegment' => urldecode($rest),
"\"URLSegment\" = '" 'SubsiteID' => $subsiteID,
. Convert::raw2sql(urldecode($rest)) ])->first();
. "' AND \"SubsiteID\" = "
. $subsiteID,
false
);
Subsite::disable_subsite_filter($origDisableSubsiteFilter); Subsite::disable_subsite_filter($origDisableSubsiteFilter);
if ($candidatePage) { if ($candidatePage) {