diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php
index f5821cc026..19f4ad355b 100644
--- a/libraries/classes/Plugins/Export/ExportCsv.php
+++ b/libraries/classes/Plugins/Export/ExportCsv.php
@@ -21,7 +21,6 @@ use function mb_strtolower;
use function mb_substr;
use function preg_replace;
use function str_replace;
-use function stripslashes;
use function trim;
/**
@@ -233,7 +232,6 @@ class ExportCsv extends ExportPlugin
$col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
}
- $col_as = stripslashes($col_as);
if ($csv_enclosed == '') {
$schema_insert .= $col_as;
} else {
diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php
index f86739e38e..1320ffa1cf 100644
--- a/libraries/classes/Plugins/Export/ExportHtmlword.php
+++ b/libraries/classes/Plugins/Export/ExportHtmlword.php
@@ -21,7 +21,6 @@ use function __;
use function htmlspecialchars;
use function in_array;
use function str_replace;
-use function stripslashes;
/**
* Handles the export for the HTML-Word format
@@ -214,7 +213,6 @@ class ExportHtmlword extends ExportPlugin
$col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
}
- $col_as = stripslashes($col_as);
$schema_insert .= '
'
. htmlspecialchars($col_as)
. ' | ';
diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php
index 0e3a678be9..0c179e8abe 100644
--- a/libraries/classes/Plugins/Export/ExportJson.php
+++ b/libraries/classes/Plugins/Export/ExportJson.php
@@ -21,7 +21,6 @@ use function __;
use function bin2hex;
use function explode;
use function json_encode;
-use function stripslashes;
use const JSON_PRETTY_PRINT;
use const JSON_UNESCAPED_UNICODE;
@@ -263,7 +262,7 @@ class ExportJson extends ExportPlugin
$col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
}
- $columns[$i] = stripslashes($col_as);
+ $columns[$i] = $col_as;
}
$record_cnt = 0;
diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php
index 91b298b52f..906ecd0276 100644
--- a/libraries/classes/Plugins/Export/ExportLatex.php
+++ b/libraries/classes/Plugins/Export/ExportLatex.php
@@ -24,7 +24,6 @@ use function in_array;
use function mb_strpos;
use function mb_substr;
use function str_replace;
-use function stripslashes;
use const PHP_VERSION;
@@ -353,7 +352,7 @@ class ExportLatex extends ExportPlugin
$buffer = '\\hline ';
for ($i = 0; $i < $columns_cnt; $i++) {
$buffer .= '\\multicolumn{1}{|c|}{\\textbf{'
- . self::texEscape(stripslashes($columns_alias[$i])) . '}} & ';
+ . self::texEscape($columns_alias[$i]) . '}} & ';
}
$buffer = mb_substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
@@ -398,9 +397,7 @@ class ExportLatex extends ExportPlugin
// print each row
for ($i = 0; $i < $columns_cnt; $i++) {
if ($record[$columns[$i]] !== null && isset($record[$columns[$i]])) {
- $column_value = self::texEscape(
- stripslashes($record[$columns[$i]])
- );
+ $column_value = self::texEscape($record[$columns[$i]]);
} else {
$column_value = $GLOBALS['latex_null'];
}
diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php
index 14b67c4f3c..0a3b273c82 100644
--- a/libraries/classes/Plugins/Export/ExportOds.php
+++ b/libraries/classes/Plugins/Export/ExportOds.php
@@ -22,7 +22,6 @@ use function __;
use function bin2hex;
use function date;
use function htmlspecialchars;
-use function stripslashes;
use function strtotime;
/**
@@ -225,9 +224,7 @@ class ExportOds extends ExportPlugin
$GLOBALS['ods_buffer'] .= ''
. ''
- . htmlspecialchars(
- stripslashes($col_as)
- )
+ . htmlspecialchars($col_as)
. ''
. '';
}
diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
index b4f4183370..e6d039e3bc 100644
--- a/libraries/classes/Plugins/Export/ExportOdt.php
+++ b/libraries/classes/Plugins/Export/ExportOdt.php
@@ -23,7 +23,6 @@ use function __;
use function bin2hex;
use function htmlspecialchars;
use function str_replace;
-use function stripslashes;
/**
* Handles the export for the ODT class
@@ -261,9 +260,7 @@ class ExportOdt extends ExportPlugin
$GLOBALS['odt_buffer'] .= ''
. ''
- . htmlspecialchars(
- stripslashes($col_as)
- )
+ . htmlspecialchars($col_as)
. ''
. '';
}
diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php
index 7bfe9377e3..426a01597e 100644
--- a/libraries/classes/Plugins/Export/ExportPhparray.php
+++ b/libraries/classes/Plugins/Export/ExportPhparray.php
@@ -19,7 +19,6 @@ use PhpMyAdmin\Version;
use function __;
use function preg_match;
use function preg_replace;
-use function stripslashes;
use function strtr;
use function var_export;
@@ -175,7 +174,7 @@ class ExportPhparray extends ExportPlugin
$col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
}
- $columns[$i] = stripslashes($col_as);
+ $columns[$i] = $col_as;
}
$tablefixed = $table;
diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php
index 80008ea99b..fe4cb85d38 100644
--- a/libraries/classes/Plugins/Export/ExportTexytext.php
+++ b/libraries/classes/Plugins/Export/ExportTexytext.php
@@ -21,7 +21,6 @@ use function __;
use function htmlspecialchars;
use function in_array;
use function str_replace;
-use function stripslashes;
/**
* Handles the export for the Texy! text class
@@ -194,8 +193,7 @@ class ExportTexytext extends ExportPlugin
$col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
}
- $text_output .= '|'
- . htmlspecialchars(stripslashes($col_as));
+ $text_output .= '|' . htmlspecialchars($col_as);
}
$text_output .= "\n|------\n";
diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php
index 9aa7fb0d9d..fe3e7d7dcd 100644
--- a/libraries/classes/Plugins/Export/ExportXml.php
+++ b/libraries/classes/Plugins/Export/ExportXml.php
@@ -21,7 +21,6 @@ use function is_array;
use function mb_substr;
use function rtrim;
use function str_replace;
-use function stripslashes;
use function strlen;
use const PHP_VERSION;
@@ -458,10 +457,7 @@ class ExportXml extends ExportPlugin
$result = $dbi->query($sqlQuery, DatabaseInterface::CONNECT_USER, DatabaseInterface::QUERY_UNBUFFERED);
$columns_cnt = $result->numFields();
- $columns = [];
- foreach ($result->getFieldNames() as $column) {
- $columns[] = stripslashes($column);
- }
+ $columns = $result->getFieldNames();
$buffer = ' ' . $crlf;
diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php
index 347325fb65..49448cd299 100644
--- a/libraries/classes/Plugins/Export/ExportYaml.php
+++ b/libraries/classes/Plugins/Export/ExportYaml.php
@@ -19,7 +19,6 @@ use function __;
use function array_key_exists;
use function is_numeric;
use function str_replace;
-use function stripslashes;
/**
* Handles the export for the YAML format
@@ -150,7 +149,7 @@ class ExportYaml extends ExportPlugin
$col_as = $aliases[$db]['tables'][$table]['columns'][$col_as];
}
- $columns[$i] = stripslashes($col_as);
+ $columns[$i] = $col_as;
}
$record_cnt = 0;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 35f1fc76d3..e1d51f22e8 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -9166,7 +9166,8 @@
$col_as
-
+
+ $col_as
$csv_enclosed
$csv_enclosed
$csv_enclosed
@@ -9264,11 +9265,12 @@
-
- $col_as
-
-
+
+ $data[$columns[$i]]
+
+
$col_as
+ $columns[$i]
$crlf
@@ -9480,11 +9482,9 @@
-
- $col_as
-
-
+
$col_as
+ $columns[$i]
$table_alias
@@ -9852,12 +9852,15 @@
-
- $col_as
-
-
+
$col_as
+ $columns[$i]
+
+ $columns[$i]
+ $columns[$i]
+ $columns[$i]
+
$table_alias
diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php
index 2c2268e4b8..ec6083f49b 100644
--- a/test/classes/Plugins/Export/ExportOdsTest.php
+++ b/test/classes/Plugins/Export/ExportOdsTest.php
@@ -357,7 +357,7 @@ class ExportOdsTest extends AbstractTestCase
$this->assertEquals(
'fna"mefna\"me' .
'fnam/<e2' .
'',
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
index fb63ff84a0..28bf5fa14c 100644
--- a/test/classes/Plugins/Export/ExportOdtTest.php
+++ b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -469,7 +469,7 @@ class ExportOdtTest extends AbstractTestCase
'is-list-header="true">Dumping data for table tablefna"me' .
+ 'value-type="string">fna\"me' .
'fnam/<e2' .
'',
$GLOBALS['odt_buffer']