[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1571-gc172669

Tue Feb 1 18:16:47 CET 2011

The branch, master has been updated
       via  c17266919d4faede52baa9e533471404029553db (commit)
       via  685e199c16cbdf66d97d5293a001f5c0b62c9850 (commit)
       via  290d448b9ae16d09770e27ac9e32c65df6009337 (commit)
      from  fbf296f70f8ebe4b70ab8adbae2b257edb028195 (commit)


- Log -----------------------------------------------------------------
commit c17266919d4faede52baa9e533471404029553db
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Feb 1 18:16:34 2011 +0100

    Another not used image

commit 685e199c16cbdf66d97d5293a001f5c0b62c9850
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Feb 1 17:52:14 2011 +0100

    Use standard javascript loading on login page.

commit 290d448b9ae16d09770e27ac9e32c65df6009337
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Feb 1 17:50:14 2011 +0100

    No need to explicitely add jquery

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

Summary of changes:
 db_search.php                       |    1 -
 libraries/auth/cookie.auth.lib.php  |   12 +-----------
 themes/darkblue_orange/img/item.png |  Bin 179 -> 0 bytes
 themes/original/img/item.png        |  Bin 179 -> 0 bytes
 4 files changed, 1 insertions(+), 12 deletions(-)
 delete mode 100644 themes/darkblue_orange/img/item.png
 delete mode 100644 themes/original/img/item.png

diff --git a/db_search.php b/db_search.php
index 0185879..4275399 100644
--- a/db_search.php
+++ b/db_search.php
@@ -37,7 +37,6 @@
  */
 require_once './libraries/common.inc.php';
 
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.4.js';
 $GLOBALS['js_include'][] = 'db_search.js';
 
 /**
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 7e04819..4f4b261 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -169,18 +169,8 @@ function PMA_auth()
     /* HTML header; do not show here the PMA version to improve security */
     $page_title = 'phpMyAdmin ';
     require './libraries/header_meta_style.inc.php';
+    require './libraries/header_scripts.inc.php';
     ?>
-<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script>
-<script src="./js/update-location.js" type="text/javascript"></script>
-<script type="text/javascript">
-//<![CDATA[
-// show login form in top frame
-if (top != self) {
-    window.top.location.href=location;
-}
-//]]>
-</script>
-<script src="./js/functions.js" type="text/javascript"></script>
 </head>
 
 <body class="loginform">
diff --git a/themes/darkblue_orange/img/item.png b/themes/darkblue_orange/img/item.png
deleted file mode 100644
index 1c51d39..0000000
Binary files a/themes/darkblue_orange/img/item.png and /dev/null differ
diff --git a/themes/original/img/item.png b/themes/original/img/item.png
deleted file mode 100644
index 1c51d39..0000000
Binary files a/themes/original/img/item.png and /dev/null differ


hooks/post-receive
-- 
phpMyAdmin


