summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--database_mysql_dump.inc6
-rw-r--r--demo.admin.js4
2 files changed, 4 insertions, 6 deletions
diff --git a/database_mysql_dump.inc b/database_mysql_dump.inc
index 372c691..83d2ed6 100644
--- a/database_mysql_dump.inc
+++ b/database_mysql_dump.inc
@@ -161,12 +161,6 @@ function _demo_dump_table_schema($fp, $table) {
// utf8_general_ci as default database collation, if not overridden via
// settings.php.
if (!strpos($output, 'COLLATE=')) {
- // Only if the collation contains a underscore, the first string up to the
- // first underscore is the character set.
- // @see PMA_exportDBCreate()
- if (strpos($status['collation'], '_')) {
- //$collate = 'COLLATE=' . $status['collation'];
- }
// If there is a character set defined already, just append the collation.
// Only look for the table definition (on the last line); column definitions
// may use a special collation, which must not be changed.
diff --git a/demo.admin.js b/demo.admin.js
index 8254516..4276c64 100644
--- a/demo.admin.js
+++ b/demo.admin.js
@@ -1,3 +1,7 @@
+/**
+ * @file
+ */
+
(function ($) {
/**