Merge branch '6.13' into 7.0

ezsystems · Jan 15, 2018 · d2d77a0 · d2d77a0
2 parents ba45f68 + cf19c6a
commit d2d77a0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/eZ/Bundle/EzPublishMigrationBundle/Command/LegacyStorage/RegenerateUrlAliasesCommand.php b/eZ/Bundle/EzPublishMigrationBundle/Command/LegacyStorage/RegenerateUrlAliasesCommand.php
@@ -259,7 +259,7 @@ protected function doBackupCustomLocationAliases()
             ->from('ezcontentobject_tree')
             ->where($queryBuilder->expr()->neq('node_id', 1))
             ->orderBy('depth', 'ASC')
-            ->orderBy('node_id', 'ASC');
+            ->addOrderBy('node_id', 'ASC');
 
         $this->output->writeln("Backing up custom URL alias(es) for {$totalCount} Location(s).");
 
@@ -586,7 +586,7 @@ protected function doGenerateLocationAliases()
             ->from('ezcontentobject_tree')
             ->where($queryBuilder->expr()->neq('node_id', 1))
             ->orderBy('depth', 'ASC')
-            ->orderBy('node_id', 'ASC');
+            ->addOrderBy('node_id', 'ASC');
 
         $this->output->writeln(
             "Publishing URL aliases for {$totalLocationCount} Location(s) " .