[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-13-g2f342d7

The branch, QA_3_4 has been updated via 2f342d7231e9c907c026aea5edbf33966594d30e (commit) from 3713680c374b90163dae6db227611d1d609d2947 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/update-location.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1b15b4..b2cdf5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,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 d271cc8..0f1e372 100644 --- a/js/update-location.js +++ b/js/update-location.js @@ -31,12 +31,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. @@ -55,6 +66,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