[5.3] Prevent null ordering on item restore from version history (#45783)

Author: travisrisner

libraries/src/Versioning/VersionableModelTrait.php

@@ -79,6 +79,11 @@ public function loadHistory($versionId, Table $table)
             $table->load($rowArray[$key]);
         }
 
+        // Fix null ordering when restoring history
+        if (\array_key_exists('ordering', $rowArray) && $rowArray['ordering'] === null) {
+            $rowArray['ordering'] = 0;
+        }
+
         return $table->bind($rowArray);
     }
 }

libraries/src/Versioning/Versioning.php

@@ -123,6 +123,17 @@ public static function store($typeAlias, $id, $data, $note = '')
             Factory::getApplication()->getDispatcher()->dispatch('onContentVersioningPrepareTable', $event);
         }
 
+        // Fix for null ordering - set to 0 if null
+        if (\is_object($data)) {
+            if (property_exists($data, 'ordering') && $data->ordering === null) {
+                $data->ordering = 0;
+            }
+        } elseif (\is_array($data)) {
+            if (\array_key_exists('ordering', $data) && $data['ordering'] === null) {
+                $data['ordering'] = 0;
+            }
+        }
+
         $historyTable->version_data = json_encode($data);
         $historyTable->version_note = $note;