Activate JUSH before loading databases

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 9c27b7d19ae49d320ffb5eaa9145733f90baddb9..cd4204665dfa2cd977675c2629d5889b10d17a14 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -761,7 +761,7 @@ username.form['auth[driver]'].onchange();
        * @return null
        */
        function navigation($missing) {
-               global $VERSION, $jush, $drivers;
+               global $VERSION, $jush, $drivers, $connection;
                ?>
 <h1>
 <?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
@@ -787,12 +787,31 @@ username.form['auth[driver]'].onchange();
                                }
                        }
                } else {
+                       if ($_GET["ns"] !== "" && !$missing && DB != "") {
+                               $connection->select_db(DB);
+                               $tables = table_status('', true);
+                       }
                        if (support("sql")) {
                                ?>
 <script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
 <script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
+<script type="text/javascript">
+<?php
+                               if ($tables) {
+                                       $links = array();
+                                       foreach ($tables as $table => $type) {
+                                               $links[] = preg_quote($table, '/');
+                                       }
+                                       echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+                                       foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
+                                               echo "jushLinks.$val = jushLinks.$jush;\n";
+                                       }
+                               }
+                               ?>
+bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');
+</script>
 <?php
                        }
                        $this->databasesPrint($missing);
@@ -804,23 +823,10 @@ username.form['auth[driver]'].onchange();
                        }
                        if ($_GET["ns"] !== "" && !$missing && DB != "") {
                                echo '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
-                               $tables = table_status('', true);
                                if (!$tables) {
                                        echo "<p class='message'>" . lang('No tables.') . "\n";
                                } else {
                                        $this->tablesPrint($tables);
-                                       if (support("sql")) {
-                                               $links = array();
-                                               foreach ($tables as $table => $type) {
-                                                       $links[] = preg_quote($table, '/');
-                                               }
-                                               echo "<script type='text/javascript'>\n";
-                                               echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
-                                               foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
-                                                       echo "jushLinks.$val = jushLinks.$jush;\n";
-                                               }
-                                               echo "</script>\n";
-                                       }
                                }
                        }
                }

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 6a3930f0b934174b9e5eb1ad4c71c0283486f9b3..ee021b7f84a6867269f0e4c4b8ecd401dba7b5aa 100644 (file)
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -7,7 +7,7 @@
 * @return null
 */
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-       global $LANG, $VERSION, $adminer, $connection, $drivers, $jush;
+       global $LANG, $VERSION, $adminer, $drivers, $jush;
        page_headers();
        $title_all = $title . ($title2 != "" ? ": $title2" : "");
        $title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
@@ -29,7 +29,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <?php } ?>
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$VERSION');"); ?>">
+<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);"<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " onload=\"verifyVersion('$VERSION');\""); ?>>
 <script type="text/javascript">
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 </script>

diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index a1a8662b3fda8be051b72944c5d166be556ad6fe..6bc8bda7c3eab7c00091b1e9b386ed589c86dced 100644 (file)
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -6,16 +6,18 @@
 function bodyLoad(version) {
        if (window.jush) {
                jush.create_links = ' target="_blank" rel="noreferrer"';
-               for (var key in jush.urls) {
-                       var obj = jush.urls;
-                       if (typeof obj[key] != 'string') {
-                               obj = obj[key];
-                               key = 0;
+               if (version) {
+                       for (var key in jush.urls) {
+                               var obj = jush.urls;
+                               if (typeof obj[key] != 'string') {
+                                       obj = obj[key];
+                                       key = 0;
+                               }
+                               obj[key] = obj[key]
+                                       .replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
+                                       .replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
+                               ;
                        }
-                       obj[key] = obj[key]
-                               .replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
-                               .replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
-                       ;
                }
                if (window.jushLinks) {
                        jush.custom_links = jushLinks;

diff --git a/editor/static/editing.js b/editor/static/editing.js
index 15681883a654c9ef25d036c90d12aeb3586098a2..9b441c4950b75bbb75e75e3466076d8ce2459675 100644 (file)
--- a/editor/static/editing.js
+++ b/editor/static/editing.js
@@ -1,8 +1,5 @@
 // Editor specific functions
 
-function bodyLoad(version) {
-}
-
 function selectFieldChange(form) {
 }