diff --git a/ChangeLog b/ChangeLog
index 3a0703d513..f2da354283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix JS number validation does not validate when the input is empty or emptied
 - issue #18561 Fix issue when adding System Monitor charts
 - issue #17363 Fix duplicate route parameter after logging in
+- issue #15670 Fix case where the data is truncated after changing a longtext column's collation
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/libraries/classes/Controllers/Table/Structure/SaveController.php b/libraries/classes/Controllers/Table/Structure/SaveController.php
index f54932a984..fd7a4e575e 100644
--- a/libraries/classes/Controllers/Table/Structure/SaveController.php
+++ b/libraries/classes/Controllers/Table/Structure/SaveController.php
@@ -192,7 +192,7 @@ final class SaveController extends AbstractController
                     } else {
                         $blob_type = 'BLOB';
                     }
-                    
+
                     $secondary_query = 'ALTER TABLE ' . Util::backquote($this->table)
                         . ' CHANGE ' . Util::backquote($_POST['field_orig'][$i])
                         . ' ' . Util::backquote($_POST['field_orig'][$i])
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f43d66a963..05214bf063 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1056,7 +1056,7 @@ parameters:
 			path: libraries/classes/Controllers/Database/OperationsController.php
 
 		-
-			message: "#^Cannot access offset non\\-empty\\-string on mixed\\.$#"
+			message: "#^Cannot access offset non\\-falsy\\-string on mixed\\.$#"
 			count: 1
 			path: libraries/classes/Controllers/Database/Structure/FavoriteTableController.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 95077ab9f4..620a3009b7 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1662,9 +1662,8 @@
       <code>$db</code>
       <code>$table</code>
     </MixedArgument>
-    <PossiblyInvalidArgument occurrences="2">
+    <PossiblyInvalidArgument occurrences="1">
       <code>$selected</code>
-      <code>$selected[$i]</code>
     </PossiblyInvalidArgument>
   </file>
   <file src="libraries/classes/Controllers/Database/Structure/FavoriteTableController.php">
@@ -9439,25 +9438,20 @@
       <code>$serverCookie</code>
       <code>$serverCookie</code>
     </MixedArgument>
-    <MixedArgumentTypeCoercion occurrences="1">
-      <code>$url_params</code>
-    </MixedArgumentTypeCoercion>
     <MixedArrayAccess occurrences="1">
       <code>$_SESSION['browser_access_time'][$key]</code>
     </MixedArrayAccess>
     <MixedArrayOffset occurrences="1">
       <code>$_SESSION['browser_access_time'][$key]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="10">
+    <MixedAssignment occurrences="8">
       <code>$GLOBALS['pma_auth_server']</code>
-      <code>$_form_params['route']</code>
       <code>$captchaSiteVerifyURL</code>
       <code>$captchaSiteVerifyURL</code>
       <code>$key</code>
       <code>$serverCookie</code>
       <code>$serverCookie</code>
       <code>$this-&gt;password</code>
-      <code>$url_params['route']</code>
       <code>$value</code>
     </MixedAssignment>
     <MixedMethodCall occurrences="6">
@@ -10028,7 +10022,7 @@
       <code>$val</code>
       <code>$values[$val]</code>
     </MixedAssignment>
-    <MixedOperand occurrences="38">
+    <MixedOperand occurrences="40">
       <code>$column['Collation']</code>
       <code>$column['Type']</code>
       <code>$crlf</code>
@@ -10063,6 +10057,8 @@
       <code>$crlf</code>
       <code>$crlf</code>
       <code>$crlf</code>
+      <code>$crlf</code>
+      <code>$crlf</code>
       <code>$definition['Type']</code>
       <code>$statement-&gt;entityOptions-&gt;has('AUTO_INCREMENT')</code>
       <code>$tmpUniqueCondition</code>