Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/classes/Plugins/Export/ExportOdt.php')
-rw-r--r--libraries/classes/Plugins/Export/ExportOdt.php18
1 files changed, 4 insertions, 14 deletions
diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
index c26496af40..65e4b6f8e1 100644
--- a/libraries/classes/Plugins/Export/ExportOdt.php
+++ b/libraries/classes/Plugins/Export/ExportOdt.php
@@ -216,7 +216,6 @@ class ExportOdt extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
- * @param string $crlf the end of line sequence
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery SQL query for obtaining data
* @param array $aliases Aliases of db/table/columns
@@ -224,7 +223,6 @@ class ExportOdt extends ExportPlugin
public function exportData(
$db,
$table,
- $crlf,
$errorUrl,
$sqlQuery,
array $aliases = []
@@ -327,11 +325,10 @@ class ExportOdt extends ExportPlugin
*
* @param string $errorUrl the url to go back in case of error
* @param string $sqlQuery the rawquery to output
- * @param string $crlf the end of line sequence
*/
- public function exportRawQuery(string $errorUrl, string $sqlQuery, string $crlf): bool
+ public function exportRawQuery(string $errorUrl, string $sqlQuery): bool
{
- return $this->exportData('', '', $crlf, $errorUrl, $sqlQuery);
+ return $this->exportData('', '', $errorUrl, $sqlQuery);
}
/**
@@ -339,12 +336,11 @@ class ExportOdt extends ExportPlugin
*
* @param string $db the database name
* @param string $view the view name
- * @param string $crlf the end of line sequence
* @param array $aliases Aliases of db/table/columns
*
* @return string resulting definition
*/
- public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
+ public function getTableDefStandIn($db, $view, $aliases = [])
{
$db_alias = $db;
$view_alias = $view;
@@ -399,7 +395,6 @@ class ExportOdt extends ExportPlugin
*
* @param string $db the database name
* @param string $table the table name
- * @param string $crlf the end of line sequence
* @param string $error_url the url to go back in case of error
* @param bool $do_relation whether to include relation comments
* @param bool $do_comments whether to include the pmadb-style column
@@ -417,7 +412,6 @@ class ExportOdt extends ExportPlugin
public function getTableDef(
$db,
$table,
- $crlf,
$error_url,
$do_relation,
$do_comments,
@@ -638,7 +632,6 @@ class ExportOdt extends ExportPlugin
*
* @param string $db database name
* @param string $table table name
- * @param string $crlf the end of line sequence
* @param string $errorUrl the url to go back in case of error
* @param string $exportMode 'create_table', 'triggers', 'create_view',
* 'stand_in'
@@ -656,7 +649,6 @@ class ExportOdt extends ExportPlugin
public function exportStructure(
$db,
$table,
- $crlf,
$errorUrl,
$exportMode,
$exportType,
@@ -679,7 +671,6 @@ class ExportOdt extends ExportPlugin
$this->getTableDef(
$db,
$table,
- $crlf,
$errorUrl,
$do_relation,
$do_comments,
@@ -711,7 +702,6 @@ class ExportOdt extends ExportPlugin
$this->getTableDef(
$db,
$table,
- $crlf,
$errorUrl,
$do_relation,
$do_comments,
@@ -729,7 +719,7 @@ class ExportOdt extends ExportPlugin
. htmlspecialchars($table_alias)
. '</text:h>';
// export a stand-in definition to resolve view dependencies
- $this->getTableDefStandIn($db, $table, $crlf, $aliases);
+ $this->getTableDefStandIn($db, $table, $aliases);
}
return true;