From ddbffcd5bd16ad38dd31e640379e205e772552ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 22 Jan 2010 19:15:47 +0000
Subject: [PATCH] [interface] It is now possible to bookmark most pages in JS
 capable browser.

---
 ChangeLog                | 1 +
 index.php                | 6 ++++++
 libraries/footer.inc.php | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 78a15b68e..695df7dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - [edit] Do not default to UNHEX when using file upload.
 - rfe #1379201 [core] Add option to configure session_save_path.
 + [interface] Provide links to documentation in highlighted SQL.
++ [interface] It is now possible to bookmark most pages in JS capable browser.
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/index.php b/index.php
index ef0f8304a..1361b5fc5 100644
--- a/index.php
+++ b/index.php
@@ -131,6 +131,12 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     var pma_text_default_tab = '<?php echo PMA_escapeJsString(PMA_getTitleForTarget($GLOBALS['cfg']['DefaultTabTable'])); ?>';
     var pma_text_left_default_tab = '<?php echo PMA_escapeJsString(PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable'])); ?>';
 
+    // Restore location from hash for bookmarks
+
+    if (parent.location.hash != '') {
+        parent.location = 'index.php?' + parent.location.hash.substring(1);
+    }
+
     // for content and navigation frames
 
     var frame_content = 0;
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index ead3e4144..ac72e15a6 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -166,6 +166,9 @@ if (!isset($GLOBALS['checked_special'])) {
 if (PMA_getenv('SCRIPT_NAME') && empty($_POST) && !$GLOBALS['checked_special']) {
     echo '<div id="selflink" class="print_ignore">' . "\n";
     $url_params['target'] = basename(PMA_getenv('SCRIPT_NAME'));
+    /* Store current location in hash part of URL to allow direct bookmarking */
+    echo '<script>parent.location.hash = "' . PMA_generate_common_url($url_params, 'text', '') . '";</script>';
+
     echo '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
         . ' title="' . $GLOBALS['strOpenNewWindow'] . '" target="_blank">';
     /*