From bf42fcff45abbf9cdafdf170f5b6cb45aec22ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20M=C3=BCller?= Date: Tue, 21 Aug 2001 10:07:14 +0000 Subject: [PATCH] fix over fix :) --- ChangeLog | 1 + lib.inc.php3 | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 841373f57..4fdc7870b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2001-08-21 Olivier Müller * db_stats.php3: added list of 20 biggest db's. * lib.inc.php3: fixed the socket patch, should work now. + * lib.inc.php3: re-fixed :) 2001-08-21 Loïc Chapeaux * db_stats.php3: ensured the script is XHTML1.0 compliant and fits the diff --git a/lib.inc.php3 b/lib.inc.php3 index f05355c3d..8309de744 100755 --- a/lib.inc.php3 +++ b/lib.inc.php3 @@ -93,7 +93,9 @@ if (!defined('__LIB_INC__')){ if (!isset($cfgTextareaRows)) { $cfgTextareaRows = 7; } - include('./defines.inc.php3'); + + // defines wants to connect mysql, and at this place there are no connexion yet... + // include('./defines.inc.php3'); @@ -275,7 +277,7 @@ if (!defined('__LIB_INC__')){ $server_socket = (empty($cfgServer['socket']) || PHP_INT_VERSION < 30010) ? '' : ':' . $cfgServer['socket']; - $dbh = @$connect_func( + $dbh = $connect_func( $cfgServer['host'] . $server_port . $server_socket, $cfgServer['stduser'], $cfgServer['stdpass'] @@ -371,10 +373,10 @@ if (!defined('__LIB_INC__')){ $server_socket = (empty($cfgServer['socket']) || PHP_INT_VERSION < 30010) ? '' : ':' . $cfgServer['socket']; - $link = @$connect_func( + $link = $connect_func( $cfgServer['host'] . $server_port . $server_socket, - $cfgServer['stduser'], - $cfgServer['stdpass'] + $cfgServer['user'], + $cfgServer['password'] ) or mysql_die(); } // end server connecting