diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php index cc3c0d495c..4a0174c648 100644 --- a/libraries/classes/Plugins/Export/ExportOdt.php +++ b/libraries/classes/Plugins/Export/ExportOdt.php @@ -387,32 +387,24 @@ class ExportOdt extends ExportPlugin /** * Returns $table's CREATE definition * - * @param string $db the database name - * @param string $table the table name - * @param string $errorUrl the url to go back in case of error - * @param bool $doRelation whether to include relation comments - * @param bool $doComments whether to include the pmadb-style column - * comments as comments in the structure; - * this is deprecated but the parameter is - * left here because /export calls - * PMA_exportStructure() also for other - * @param bool $doMime whether to include mime comments - * @param bool $showDates whether to include creation/update/check dates - * @param bool $addSemicolon whether to add semicolon and end-of-line at - * the end - * @param bool $view whether we're handling a view - * @param mixed[] $aliases Aliases of db/table/columns + * @param string $db the database name + * @param string $table the table name + * @param bool $doRelation whether to include relation comments + * @param bool $doComments whether to include the pmadb-style column + * comments as comments in the structure; + * this is deprecated but the parameter is + * left here because /export calls + * PMA_exportStructure() also for other + * @param bool $doMime whether to include mime comments + * the end + * @param mixed[] $aliases Aliases of db/table/columns */ public function getTableDef( string $db, string $table, - string $errorUrl, bool $doRelation, bool $doComments, bool $doMime, - bool $showDates = false, - bool $addSemicolon = true, - bool $view = false, array $aliases = [], ): bool { $dbAlias = $db; @@ -660,18 +652,7 @@ class ExportOdt extends ExportPlugin . __('Table structure for table') . ' ' . htmlspecialchars($tableAlias) . ''; - $this->getTableDef( - $db, - $table, - $errorUrl, - $doRelation, - $doComments, - $doMime, - $dates, - true, - false, - $aliases, - ); + $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, $aliases); break; case 'triggers': $triggers = Triggers::getDetails($GLOBALS['dbi'], $db, $table); @@ -691,18 +672,7 @@ class ExportOdt extends ExportPlugin . __('Structure for view') . ' ' . htmlspecialchars($tableAlias) . ''; - $this->getTableDef( - $db, - $table, - $errorUrl, - $doRelation, - $doComments, - $doMime, - $dates, - true, - true, - $aliases, - ); + $this->getTableDef($db, $table, $doRelation, $doComments, $doMime, $aliases); break; case 'stand_in': $GLOBALS['odt_buffer'] .= ' - - $addSemicolon - $errorUrl - $showDates - $view - string diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index 91ec902d24..86a1634b4d 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -632,7 +632,6 @@ class ExportOdtTest extends AbstractTestCase $this->object->getTableDef( 'database', '', - 'example.com', true, true, true, @@ -715,7 +714,6 @@ class ExportOdtTest extends AbstractTestCase $this->object->getTableDef( 'database', '', - 'example.com', true, true, true,