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

*** empty log message ***

Browse Source
This commit is contained in:
Marcel Tschopp
2004-03-25 22:13:32 +00:00
parent 15b85dc054
commit e5c4f13829
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-03-25 Marcel Tschopp <marcel.tschopp@gmx.net>
* tbl_change.php, libraries/dbi/mysql.inc.php, libraries/dbi/mysqli.inc.php:
Added wrapping function PMA_DBI_field_len.
* libraries/dbi/mysqli.inc.php: Set default value '' for parameter $link
from function PMA_DBI_insert_id().
2004-03-25 Michal Cihar <michal@cihar.com> 2004-03-25 Michal Cihar <michal@cihar.com>
* libraries/bookmark.lib.php: Fix errors when bookmarktable does not * libraries/bookmark.lib.php: Fix errors when bookmarktable does not
exists (bug #922509). exists (bug #922509).

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

@@ -255,4 +255,8 @@ function PMA_DBI_num_fields($result) {
return mysql_num_fields($result); return mysql_num_fields($result);
} }
function PMA_DBI_field_len($result, $i) {
return mysql_field_len($result, $i);
}
?> ?>

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

@@ -204,7 +204,7 @@ function PMA_DBI_num_rows($result) {
return @mysqli_num_rows($result); return @mysqli_num_rows($result);
} }
function PMA_DBI_insert_id($link) { function PMA_DBI_insert_id($link = '') {
if (empty($link)) { if (empty($link)) {
if (isset($GLOBALS['userlink'])) { if (isset($GLOBALS['userlink'])) {
$link = $GLOBALS['userlink']; $link = $GLOBALS['userlink'];
@@ -344,4 +344,9 @@ function PMA_DBI_num_fields($result) {
return mysqli_num_fields($result); return mysqli_num_fields($result);
} }
function PMA_DBI_field_len($result, $i) {
$info = mysqli_fetch_field_direct($result, $i);
return $info->length;
}
?> ?>

2
tbl_change.php
View File

@@ -297,7 +297,7 @@ foreach($loop_array AS $vrowcount => $vrow) {
} }
$len = (preg_match('@float|double@', $row_table_def['Type'])) $len = (preg_match('@float|double@', $row_table_def['Type']))
? 100 ? 100
: @mysql_field_len($vresult, $i); // !UNWRAPPED FUNCTION! : PMA_DBI_field_len($vresult, $i);
$first_timestamp = 0; $first_timestamp = 0;
$bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; $bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];