Avoid double replacing AJAX favicon

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 6c163a0ba56a9e03c66491e7cf3cb3940d67ff36..f2654b36c3323f892a59e56ff77099cf6fdcb447 100644 (file)
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -263,14 +263,11 @@ function ajaxSetHtml(url) {
 
 /** Replace favicon
 * @param string
-* @return string original href
 */
 function replaceFavicon(href) {
        var favicon = document.getElementById('favicon');
-       var orig = favicon.href;
        favicon.href = href;
        favicon.parentNode.appendChild(favicon); // to replace the icon in Firefox
-       return orig;
 }
 
 var ajaxState = 0;
@@ -283,7 +280,7 @@ var ajaxState = 0;
 */
 function ajaxSend(url, data, popState) {
        var currentState = ++ajaxState;
-       var favicon = replaceFavicon('../adminer/static/loader.gif');
+       replaceFavicon('../adminer/static/loader.gif');
        setHtml('loader', '<img src="../adminer/static/loader.gif" alt="">');
        return ajax(url, function (xmlhttp) {
                if (currentState == ajaxState) {
@@ -298,7 +295,7 @@ function ajaxSend(url, data, popState) {
                                }
                                return ajaxSend(redirect);
                        }
-                       replaceFavicon(favicon);
+                       replaceFavicon('../adminer/static/favicon.ico');
                        if (!xmlhttp.status) {
                                setHtml('loader', '');
                        } else {

diff --git a/compile.php b/compile.php
index f1dbbc57f74c89ca23dd77495b5b3287418d4cae..d643245aff23de967fafeca35c35690801639d0b 100644 (file)
--- a/compile.php
+++ b/compile.php
@@ -262,6 +262,7 @@ foreach (array("adminer", "editor") as $project) {
        $file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
        $file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
        $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&amp;version=' . $VERSION;
+       $file = preg_replace("~'\\.\\./adminer/static/(loader\\.gif|favicon\\.ico)~", "location.pathname+'?file=\\1&amp;version=$VERSION", $file);
        $file = preg_replace('~\\.\\./adminer/static/(loader\\.gif)~', "'+location.pathname+'?file=\\1&amp;version=$VERSION", $file);
        $file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
        $file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);