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

undefined constant at login time

Browse Source
This commit is contained in:
Marc Delisle
2005-10-05 13:19:46 +00:00
parent f2d4f28e2a
commit 1d33bd372b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ $Source$
MySQL 5.0.13 views MySQL 5.0.13 views
* libraries/display_tbl.lib.php: bug #1306833, full text link broken, * libraries/display_tbl.lib.php: bug #1306833, full text link broken,
thanks to Vernon Lyon - vlyon thanks to Vernon Lyon - vlyon
* libraries/charset_conversion.lib.php: PMA_MYSQL_INT_VERSION is not
defined at login time but what tested
2005-10-04 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-10-04 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/functions.js, libraries/sql_query_form.lib.php: * libraries/functions.js, libraries/sql_query_form.lib.php:

3
libraries/charset_conversion.lib.php
View File

@@ -140,7 +140,8 @@ function PMA_convert_display_charset($what) {
if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
|| $convcharset == $charset // rabus: if input and output charset are the same, we don't have to do anything... || $convcharset == $charset // rabus: if input and output charset are the same, we don't have to do anything...
|| PMA_MYSQL_INT_VERSION >= 40100 ) { // lem9: even if AllowAnywhereRecoding is TRUE, do not recode for MySQL >= 4.1.x since MySQL does the job // this constant is not defined before the login:
|| (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION >= 40100) ) { // lem9: even if AllowAnywhereRecoding is TRUE, do not recode for MySQL >= 4.1.x since MySQL does the job
return $what; return $what;
} }
else if (is_array($what)) { else if (is_array($what)) {