Fix: SQL ORDER BY ohne nicht vorhandene sorting-Spalten in News/Event-Kopie

public/icon.svg

@@ -1,6 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" fill="none">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-  <rect x="4" y="5" width="11" height="9" rx="2" stroke="#1f2937" stroke-width="2"/>
+<svg
-  <rect x="17" y="5" width="11" height="9" rx="2" stroke="#1f2937" stroke-width="2" opacity="0.55"/>
+   viewBox="0 0 32 32"
-  <rect x="4" y="18" width="11" height="9" rx="2" stroke="#1f2937" stroke-width="2" opacity="0.55"/>
+   fill="none"
-  <path d="M19 19h9m-4-4 4 4-4 4" stroke="#0f766e" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
+   version="1.1"
-</svg>
+   id="svg10"
+   sodipodi:docname="icon.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="32"
+     inkscape:cx="14.015625"
+     inkscape:cy="16"
+     inkscape:window-width="2560"
+     inkscape:window-height="1408"
+     inkscape:window-x="2560"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <rect
+     x="4"
+     y="5"
+     width="11"
+     height="9"
+     rx="2"
+     stroke="#1f2937"
+     stroke-width="2"
+     id="rect2" />
+  <rect
+     x="18"
+     y="5"
+     width="11"
+     height="9"
+     rx="2"
+     stroke="#1f2937"
+     stroke-width="2"
+     opacity="0.55"
+     id="rect4" />
+  <rect
+     x="4"
+     y="18"
+     width="11"
+     height="9"
+     rx="2"
+     stroke="#1f2937"
+     stroke-width="2"
+     opacity="0.55"
+     id="rect6" />
+  <path
+     d="m 19,22.5 h 9 m -4,-4 4,4 -4,4"
+     stroke="#0f766e"
+     stroke-width="2.5"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path8" />
+</svg>

src/Service/DummyCopier.php

@@ -426,7 +426,7 @@ final class DummyCopier
             $map[(int) $sourceArchiveId] = $newArchiveId;
             $result->copiedNewsArchives++;
 
-            $newsIds = $this->connection->fetchFirstColumn('SELECT id FROM tl_news WHERE pid = ? ORDER BY date, sorting, id', [(int) $sourceArchiveId]);
+            $newsIds = $this->connection->fetchFirstColumn('SELECT id FROM tl_news WHERE pid = ? ORDER BY date, id', [(int) $sourceArchiveId]);
 
             foreach ($newsIds as $newsId) {
                 $newsRow = $this->fetchRow('tl_news', (int) $newsId);
@@ -492,7 +492,7 @@ final class DummyCopier
             $map[(int) $sourceCalendarId] = $newCalendarId;
             $result->copiedCalendars++;
 
-            $eventIds = $this->connection->fetchFirstColumn('SELECT id FROM tl_calendar_events WHERE pid = ? ORDER BY startTime, sorting, id', [(int) $sourceCalendarId]);
+            $eventIds = $this->connection->fetchFirstColumn('SELECT id FROM tl_calendar_events WHERE pid = ? ORDER BY startTime, id', [(int) $sourceCalendarId]);
 
             foreach ($eventIds as $eventId) {
                 $eventRow = $this->fetchRow('tl_calendar_events', (int) $eventId);