From effe79664c0982150193d089e832f7c7ea229f47 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 23 Jan 2024 22:17:32 +0100
Subject: [PATCH] Fix navigation page after table edit

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 libraries/classes/InsertEdit.php |  2 +-
 psalm-baseline.xml               | 12 ++++++------
 test/classes/InsertEditTest.php  |  7 +++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 3ef0dc9e8a..e88946a6a1 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -1245,7 +1245,7 @@ class InsertEdit
             if (! preg_match('@^[a-z_]+\.php$@', $GLOBALS['goto'])) {
                 // this should NOT happen
                 //$GLOBALS['goto'] = false;
-                if ($GLOBALS['goto'] === 'index.php?route=/sql') {
+                if (str_contains($GLOBALS['goto'], 'index.php?route=/sql')) {
                     $gotoInclude = '/sql';
                 } else {
                     $gotoInclude = false;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 6fdeed3ccb..fde56a20c9 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3056,14 +3056,9 @@
     </TypeDoesNotContainType>
   </file>
   <file src="libraries/classes/Controllers/Table/ChartController.php">
-    <InvalidArgument occurrences="2">
-      <code>$rows</code>
+    <InvalidArgument occurrences="1">
       <code>$start</code>
     </InvalidArgument>
-    <InvalidScalarArgument occurrences="2">
-      <code>$_REQUEST['pos']</code>
-      <code>$_REQUEST['session_max_rows']</code>
-    </InvalidScalarArgument>
     <MixedArgument occurrences="7">
       <code>$db</code>
       <code>$db</code>
@@ -3079,6 +3074,11 @@
     <MixedAssignment occurrences="1">
       <code>$url_params['db']</code>
     </MixedAssignment>
+    <PossiblyInvalidArgument occurrences="3">
+      <code>$_REQUEST['pos']</code>
+      <code>$_REQUEST['session_max_rows']</code>
+      <code>$rows</code>
+    </PossiblyInvalidArgument>
     <PossiblyInvalidOperand occurrences="4">
       <code>$_REQUEST['pos']</code>
       <code>$_REQUEST['pos']</code>
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index d108393352..b6db4bf505 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -1884,6 +1884,13 @@ class InsertEditTest extends AbstractTestCase
 
         $this->assertEquals('', $GLOBALS['table']);
 
+        $GLOBALS['goto'] = 'index.php?route=/sql&server=2';
+
+        $this->assertEquals(
+            '/sql',
+            $this->insertEdit->getGotoInclude('index')
+        );
+
         $_POST['after_insert'] = 'new_insert';
         $this->assertEquals(
             '/table/change',