The branch, master has been updated
via 1b6f4c076d83ba1734056359b16ff33ea2a9a419 (commit)
from 7d599c14ba958cf7fa488a7a3f9468a6bdefc22c (commit)
- Log -----------------------------------------------------------------
commit 1b6f4c076d83ba1734056359b16ff33ea2a9a419
Author: Michal Čihař <[email protected]>
Date: Tue Feb 8 10:07:24 2011 +0100
Fix typo in path
-----------------------------------------------------------------------
Summary of changes:
libraries/core.lib.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index c2c82fb..cb1a851 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -682,10 +682,10 @@ function PMA_linkURL($url) {
* @return string HTML code for javascript inclusion.
*/
function PMA_includeJS($url) {
- if (strpos($js_script_file, '?') === FALSE) {
- return '<script src="./js/' . $js_script_file . '?ts=' .
filemtime('./js/' . $js_script_file) . '" type="text/javascript"></script>' .
"\n";
+ if (strpos($url, '?') === FALSE) {
+ return '<script src="./js/' . $url . '?ts=' . filemtime('./js/' .
$url) . '" type="text/javascript"></script>' . "\n";
} else {
- return '<script src="./js/' . $js_script_file . '"
type="text/javascript"></script>' . "\n";
+ return '<script src="./js/' . $url . '"
type="text/javascript"></script>' . "\n";
}
}
?>
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git