gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-10-18 14:31:41 +02:00
commit ce85124fab
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libraries/plugins/export/ExportHtmlword.class.php
View File

@ -322,36 +322,28 @@ class ExportHtmlword extends ExportPlugin
/**
* Returns $table's CREATE definition
*
* @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
* @param string $db the database name
* @param string $table the table name
* @param bool $do_relation whether to include relation comments
* @param bool $do_comments whether to include the pmadb-style column
* comments as comments in the structure;
* this is deprecated but the parameter is
* left here because export.php calls
* PMA_exportStructure() also for other
* export types which use this parameter
* @param bool $do_mime whether to include mime comments
* @param bool $show_dates whether to include creation/update/check dates
* @param bool $add_semicolon whether to add semicolon and end-of-line
* @param bool $do_mime whether to include mime comments
* at the end
* @param bool $view whether we're handling a view
* @param array $aliases Aliases of db/table/columns
* @param bool $view whether we're handling a view
* @param array $aliases Aliases of db/table/columns
*
* @return string resulting schema
*/
public function getTableDef(
$db,
$table,
$crlf,
$error_url,
$do_relation,
$do_comments,
$do_mime,
$show_dates = false,
$add_semicolon = true,
$view = false,
$aliases = array()
) {
@ -572,8 +564,8 @@ class ExportHtmlword extends ExportPlugin
. htmlspecialchars($table_alias)
. '</h2>';
$dump .= $this->getTableDef(
$db, $table, $crlf, $error_url, $do_relation, $do_comments, $do_mime,
$dates, true, false, $aliases
$db, $table, $do_relation, $do_comments, $do_mime,
false, $aliases
);
break;
case 'triggers':
@ -591,8 +583,8 @@ class ExportHtmlword extends ExportPlugin
. __('Structure for view') . ' ' . htmlspecialchars($table_alias)
. '</h2>';
$dump .= $this->getTableDef(
$db, $table, $crlf, $error_url, $do_relation, $do_comments, $do_mime,
$dates, true, true, $aliases
$db, $table, $do_relation, $do_comments, $do_mime,
true, $aliases
);
break;
case 'stand_in':