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

Merge remote-tracking branch 'chanaka/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-08-03 07:59:02 +02:00
commit 27d9010d21
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/CommonFunctions.class.php
View File

@ -2302,7 +2302,9 @@ class PMA_CommonFunctions
$con_key = $this->backquote($meta->table) . '.'
. $this->backquote($meta->orgname);
} // end if... else...
$condition = ' ' . $con_key . ' ';
$condition = ($fields_cnt == 1)
? ' CHAR_LENGTH(' . $con_key . ') '
: ' ' . $con_key . ' ';
if (! isset($row[$i]) || is_null($row[$i])) {
$con_val = 'IS NULL';
@ -2330,7 +2332,9 @@ class PMA_CommonFunctions
$con_val = '= CAST(0x' . bin2hex($row[$i]) . ' AS BINARY)';
} else {
// this blob won't be part of the final condition
$con_val = null;
$con_val = ($fields_cnt == 1)
? ' = '. strlen($row[$i])
: null;
}
} elseif (in_array($meta->type, $this->getGISDatatypes())