diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 0f579822c3..a5a6ccf048 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -94,11 +94,11 @@ if (isset($plugin_list)) { xmlns="http://www.w3.org/TR/REC-html40"> + . ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + . (isset($charset_of_file) ? $charset_of_file : 'utf-8') . '" /> ' ); @@ -107,7 +107,7 @@ if (isset($plugin_list)) { /** * Outputs database header * - * @param string $db Database name + * @param string $db Database name * * @return bool Whether it succeeded * @@ -123,7 +123,7 @@ if (isset($plugin_list)) { /** * Outputs database footer * - * @param string $db Database name + * @param string $db Database name * * @return bool Whether it succeeded * @@ -137,7 +137,7 @@ if (isset($plugin_list)) { /** * Outputs CREATE DATABASE statement * - * @param string $db Database name + * @param string $db Database name * * @return bool Whether it succeeded * @@ -151,11 +151,11 @@ if (isset($plugin_list)) { /** * Outputs the content of a table in HTML (Microsoft Word) format * - * @param string $db database name - * @param string $table table name - * @param string $crlf the end of line sequence - * @param string $error_url the url to go back in case of error - * @param string $sql_query SQL query for obtaining data + * @param string $db database name + * @param string $table table name + * @param string $crlf the end of line sequence + * @param string $error_url the url to go back in case of error + * @param string $sql_query SQL query for obtaining data * * @return bool Whether it succeeded * @@ -405,10 +405,10 @@ if (isset($plugin_list)) { $schema_insert .= '' . (isset($res_rel[$field_name]) ? htmlspecialchars( - $res_rel[$field_name]['foreign_table'] - . ' (' . $res_rel[$field_name]['foreign_field'] - . ')' - ) + $res_rel[$field_name]['foreign_table'] + . ' (' . $res_rel[$field_name]['foreign_field'] + . ')' + ) : '') . ''; } if ($do_comments && $cfgRelation['commwork']) { @@ -436,10 +436,10 @@ if (isset($plugin_list)) { /** * Outputs triggers * - * @param string $db database name - * @param string $table table name + * @param string $db database name + * @param string $table table name * - * @return string Formatted triggers list + * @return string Formatted triggers list * * @access public */ @@ -477,27 +477,26 @@ if (isset($plugin_list)) { } /** - * Outputs table's structure * - * @param string $db database name - * @param string $table 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 database name + * @param string $table 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 * 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 $dates whether to include creation/update/check dates - * @param string $export_mode 'create_table', 'triggers', 'create_view', - * 'stand_in' - * @param string $export_type 'server', 'database', 'table' + * @param bool $do_mime whether to include mime comments + * @param bool $dates whether to include creation/update/check dates + * @param string $export_mode 'create_table', 'triggers', 'create_view', + * 'stand_in' + * @param string $export_type 'server', 'database', 'table' * - * @return bool Whether it succeeded + * @return bool Whether it succeeded * * @access public */ @@ -558,10 +557,10 @@ if (isset($plugin_list)) { /** * Formats the definition for one column * - * @param array $column info about this column - * @param array $unique_keys unique keys of the table + * @param array $column info about this column + * @param array $unique_keys unique keys of the table * - * @return string Formatted column definition + * @return string Formatted column definition * * @access public */ @@ -601,9 +600,11 @@ if (isset($plugin_list)) { : __('Yes')) . ''; $definition .= '' - . htmlspecialchars(isset($column['Default']) + . htmlspecialchars( + isset($column['Default']) ? $column['Default'] - : '') + : '' + ) . ''; return $definition;