[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24467-g9bb001b

[Rouslan Placella]

The branch, master has been updated
       via  9bb001b556f491cf1ffa292e909366bb1ad3f36c (commit)
       via  2f342d7231e9c907c026aea5edbf33966594d30e (commit)
      from  3813b62611009e9cde2e36e3a5865402ea0275ed (commit)


- Log -----------------------------------------------------------------
commit 9bb001b556f491cf1ffa292e909366bb1ad3f36c
Merge: 3813b62 2f342d7
Author: Rouslan Placella <rouslan at placella.com>
Date:   Wed Dec 7 12:32:52 2011 +0000

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    1 +
 js/update-location.js |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a200eb8..220da9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@ phpMyAdmin - ChangeLog
 - bug #3306875 [edit] Can't rename a database that contains views
 - bug #3452506 [edit] Unable to move tables with triggers
 - bug #3449659 [navi] Fast filter broken with table tree
+- bug #3448485 [GUI] Firefox favicon frameset regression
 
 3.4.8.0 (2011-12-01)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
diff --git a/js/update-location.js b/js/update-location.js
index 3b9c51d..18e9851 100644
--- a/js/update-location.js
+++ b/js/update-location.js
@@ -32,12 +32,23 @@ function setURLHash(hash)
         }
         if (hash_init_done) {
             window.location.hash = "PMAURL:" + hash;
+            fix_favicon();
         } else {
             hash_to_set = "PMAURL:" + hash;
         }
     }
 }
 
+// Fix favicon disappearing in Firefox when setting location.hash
+// See bug #3448485
+function fix_favicon() {
+    if (jQuery.browser.mozilla) {
+        // Move the link tags for the favicon to the bottom
+        // of the head element to force a reload of the favicon
+        $('head > link[href=\\.\\/favicon\\.ico]').appendTo('head');
+    }
+}
+
 /**
  * Handler for changing url according to the hash part, which is updated
  * on each page to allow bookmarks.
@@ -56,6 +67,7 @@ $(document).ready(function(){
     if (hash_to_set != "") {
         window.location.hash = hash_to_set;
         hash_to_set = "";
+        fix_favicon();
     }
     /* Indicate that we're done (and we are not going to change location */
     hash_init_done = 1;


hooks/post-receive
-- 
phpMyAdmin