patch #1502453, unnecessary disc access

2006-06-09 20:45:17 +00:00
parent d4c13a9e55
commit 110277793a
4 changed files with 11 additions and 13 deletions
--- a/3
+++ b/3
@@ -8,6 +8,9 @@ $Source$
 2006-06-09 Marc Delisle  <lem9@users.sourceforge.net>
    * tbl_select.php: bug #1490569, search with LIKE on numeric fields
    * libraries/import.lib.php: support display of HANDLER statement results
+    * libraries/header.inc.php, libraries/auth/http.auth.lib.php,
+      /cookie.auth.lib.php, removed header_custom.inc.php: 
+      patch #1502453, unnecessary disk access, thanks to Juergen Wind

 2006-06-08 Marc Delisle  <lem9@users.sourceforge.net>
    * libraries/header.inc.php: bug #1501891, undefined PMA_isSuperuser() when 
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -100,7 +100,10 @@ if (top != self) {

 <body class="loginform">

-<?php require './libraries/header_custom.inc.php'; ?>
+<?php if (file_exists('./config.header.inc.php')) {
+          require('./config.header.inc.php');
+      } 
+?>

 <div class="container">
 <a href="http://www.phpmyadmin.net" target="_blank" class="logo"><?php
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -33,7 +33,10 @@ function PMA_auth() {
    ?>
 </head>
 <body>
-<?php require './libraries/header_custom.inc.php'; ?>
+<?php if (file_exists('./config.header.inc.php')) {
+          require('./config.header.inc.php');
+      } 
+ ?>

 <br /><br />
 <center>
--- a/libraries/header_custom.inc.php
+++ b/libraries/header_custom.inc.php
@@ -1,11 +0,0 @@
-<?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
-// This file includes all custom headers if they exist.
-
-// Include site header
-if (file_exists('./config.header.inc.php')) {
-    require('./config.header.inc.php');
-}
-?>