diff --git a/ChangeLog b/ChangeLog
index 4b6bda786..0188759b9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,11 @@ $Id$
- bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default
- bug [doc] Withdraw or edit FAQ entries related to older MySQL or PHP
- bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop
+- bug #3044189 [doc] Cleared documentation for hide_db.
+- bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php.
+
+3.3.5.1 (2010-10-20)
+- [core] Fixed various XSS issues, see PMASA-2010-5 for more details.
3.3.5.0 (2010-07-26)
- patch #2932113 [information_schema] Slow export when having lots of
diff --git a/Documentation.html b/Documentation.html
index edfad9bdc..a78284794 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -849,7 +849,7 @@ since this link provides funding for phpMyAdmin.
For example, to hide all databases starting with the letter "a", use
$cfg['Servers'][$i]['hide_db'] = '^a';
and to hide both "db1" and "db2" use
-
$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';
+
$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';
More information on regular expressions can be found in the
PCRE pattern syntax portion of the PHP reference manual.
@@ -2021,6 +2021,14 @@ setfacl -d -m "g:www-data:rwx" tmp
identify what they mean.
+
$cfg['Export']['method'] string
+
+ Defines how the export form is displayed when it loads. Valid values are:
+
quick to display the minimum number of options to configure
+
custom to display every available option to configure
+
custom-no-form same as custom but does not display the option of using quick export
+
+
$cfg['Import'] array
In this array are defined default parameters for import, names of
diff --git a/db_export.php b/db_export.php
index a44469ef2..a24ed18d7 100755
--- a/db_export.php
+++ b/db_export.php
@@ -15,6 +15,8 @@
*/
require_once './libraries/common.inc.php';
+$GLOBALS['js_include'][] = 'export.js';
+
// $sub_part is also used in db_info.inc.php to see if we are coming from
// db_export.php, in which case we don't obey $cfg['MaxTableList']
$sub_part = '_export';
@@ -38,20 +40,32 @@ $checkall_url = 'db_export.php?'
. PMA_generate_common_url($db)
. '&goto=db_export.php';
-$multi_values = '