[5.x] Ensure consistent order of get_content results (#11429)

Author: daun

src/Tags/GetContent.php

@@ -5,6 +5,7 @@
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
+use Statamic\Query\OrderedQueryBuilder;
 use Statamic\Support\Str;
 use Statamic\Tags\Concerns\OutputsItems;
 
@@ -58,6 +59,11 @@ private function entries($items)
             ->where('site', $this->params->get(['site', 'locale'], Site::current()->handle()))
             ->whereIn($usingUris ? 'uri' : 'id', $items);
 
+        // Ensure correct order of results
+        if (! $usingUris) {
+            $query = new OrderedQueryBuilder($query, $items);
+        }
+
         return $this->output($query->get());
     }
 }

tests/Tags/GetContentTagTest.php

@@ -61,6 +61,19 @@ public function it_gets_multiple_items_by_pipe_delimited_ids()
         );
     }
 
+    #[Test]
+    public function it_maintains_order_of_multiple_items()
+    {
+        $this->assertParseEquals(
+            '<First><Second>',
+            '{{ get_content from="123|456" }}<{{ title }}>{{ /get_content }}'
+        );
+        $this->assertParseEquals(
+            '<Second><First>',
+            '{{ get_content from="456|123" }}<{{ title }}>{{ /get_content }}'
+        );
+    }
+
     #[Test]
     public function it_gets_multiple_items_by_pipe_delimited_uris()
     {