[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10113-g9187f5a

[Marc Delisle]

The branch, master has been updated
       via  9187f5abe2dec8161ad420f165b307988dceab6a (commit)
      from  13b7e75428c88e9c0b43ec613445243124d81662 (commit)


- Log -----------------------------------------------------------------
commit 9187f5abe2dec8161ad420f165b307988dceab6a
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Sep 13 13:03:45 2010 -0400

    jquery components should be under js/jquery

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

Summary of changes:
 js/{ => jquery}/jquery.qtip-1.0.0.min.js |    0
 libraries/header_scripts.inc.php         |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename js/{ => jquery}/jquery.qtip-1.0.0.min.js (100%)

diff --git a/js/jquery.qtip-1.0.0.min.js b/js/jquery/jquery.qtip-1.0.0.min.js
similarity index 100%
rename from js/jquery.qtip-1.0.0.min.js
rename to js/jquery/jquery.qtip-1.0.0.min.js
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index 8126dd3..76b0852 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -31,7 +31,7 @@ $title = PMA_expandUserString(
 $is_superuser    = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
 
 $GLOBALS['js_include'][] = 'functions.js';
-$GLOBALS['js_include'][] = 'jquery.qtip-1.0.0.min.js';
+$GLOBALS['js_include'][] = 'jquery/jquery.qtip-1.0.0.min.js';
 $params = array('lang' => $GLOBALS['lang']);
 if (isset($GLOBALS['db'])) {
     $params['db'] = $GLOBALS['db'];


hooks/post-receive
-- 
phpMyAdmin