Merge branch '1.7' into 1

silverstripe · Feb 26, 2021 · abf0a9d · abf0a9d
2 parents 5ae10ba + 3c006fc
commit abf0a9d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 23 deletions.
diff --git a/lang/de.yml b/lang/de.yml
@@ -1,10 +1,4 @@
 de:
-  SilverStripe\VersionedAdmin\ArchiveAdmin:
-    MENUTITLE: Archiv
-  SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
-    MENUTITLE: 'Seite bearbeiten'
-  SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
-    MENUTITLE: Versionsverlauf
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Leer
     ITEMS_CHANGES:

diff --git a/lang/en.yml b/lang/en.yml
@@ -1,10 +1,4 @@
 en:
-  SilverStripe\VersionedAdmin\ArchiveAdmin:
-    MENUTITLE: Archives
-  SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
-    MENUTITLE: 'Edit Page'
-  SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
-    MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Empty
     ITEMS_CHANGES:

diff --git a/lang/fi.yml b/lang/fi.yml
@@ -1,10 +1,4 @@
 fi:
-  SilverStripe\VersionedAdmin\ArchiveAdmin:
-    MENUTITLE: Arkistot
-  SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
-    MENUTITLE: 'Muokkaa sivua'
-  SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
-    MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Tyhjä
     ITEMS_CHANGES:

diff --git a/lang/pl.yml b/lang/pl.yml
@@ -1,8 +1,4 @@
 pl:
-  SilverStripe\VersionedAdmin\ArchiveAdmin:
-    MENUTITLE: Archiwum
-  SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
-    MENUTITLE: 'Edytuj stronę'
   SilverStripe\Versioned\ChangeSet:
     EMPTY: Pusty
     ITEMS_CHANGES:

diff --git a/src/RecursivePublishable.php b/src/RecursivePublishable.php
@@ -409,7 +409,9 @@ public function unlinkDisownedRelationship($source, $targetStage, $relationship)
         }
 
         // Query the source for the list of items to NOT remove
-        $ownedSQL = $owner->getComponents($relationship)->sql($ownedParams);
+        $ownedQuery = $owner->getComponents($relationship);
+        // remove sort for sub query because some DB drivers don't let you sort sub queries
+        $ownedSQL = $ownedQuery->dataQuery()->sort(null, null, true)->sql($ownedParams);
         $disowned->addWhere([
             "\"{$targetTable}\".\"ID\" NOT IN (SELECT \"Source\".\"ID\" FROM ({$ownedSQL}) AS \"Source\")" => $ownedParams
         ]);