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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-02-12 10:06:56 +01:00
commit 83f396164a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/Util.class.php
View File

@ -2235,9 +2235,7 @@ class PMA_Util
$con_key = self::backquote($meta->table) . '.'
. self::backquote($meta->orgname);
} // end if... else...
$condition = ($fields_cnt == 1)
? ' CHAR_LENGTH(' . $con_key . ') '
: ' ' . $con_key . ' ';
$condition = ' ' . $con_key . ' ';
if (! isset($row[$i]) || is_null($row[$i])) {
$con_val = 'IS NULL';
@ -2259,11 +2257,14 @@ class PMA_Util
// use a CAST if possible, to avoid problems
// if the field contains wildcard characters % or _
$con_val = '= CAST(0x' . bin2hex($row[$i]) . ' AS BINARY)';
} else if ($fields_cnt == 1) {
// when this blob is the only field present
// try settling with length comparison
$condition = ' CHAR_LENGTH(' . $con_key . ') ';
$con_val = ' = ' . strlen($row[$i]);
} else {
// this blob won't be part of the final condition
$con_val = ($fields_cnt == 1)
? ' = '. strlen($row[$i])
: null;
$con_val = null;
}
} elseif (in_array($meta->type, self::getGISDatatypes())
&& ! empty($row[$i])