nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

two small fixes

Browse Source
This commit is contained in:
Alexander M. Turek
2004-06-17 21:19:33 +00:00
parent f3eed79c1b
commit b4e74d987a
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-06-17 Alexander M. Turek <me@derrabus.de>
* libraries/dbi/mysql.dbi.php: Removed debug code.
* libraries/dbi/mysqli.dbi.php: If connecting fails, we don't know the
MySQL version.
2004-06-17 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: fix "original" theme colors
* db_details_structure.php: cosmetic fix in error message

2
libraries/dbi/mysql.dbi.lib.php
View File

@@ -1,7 +1,7 @@
<?php
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
error_reporting(E_ALL);
/**
* Interface to the classic MySQL extension
*/

2
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -206,7 +206,7 @@ function PMA_DBI_getError($link = NULL) {
if ($error && $error == 2002) {
$error = '#' . ((string) $error) . ' - ' . $GLOBALS['strServerNotResponding'];
} elseif ($error && PMA_MYSQL_INT_VERSION >= 40100) {
} elseif ($error && defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION >= 40100) {
$error = '#' . ((string) $error) . ' - ' . $error_message;
} elseif ($error) {
$error = '#' . ((string) $error) . ' - ' . PMA_convert_display_charset($error_message);