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 2012-10-28 10:46:54 +01:00
commit e89b5cd217
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/TableSearch.class.php
View File

@ -657,8 +657,9 @@ EOT;
}
// If there are no search criteria set or no unary criteria operators, return
if (! array_filter($_POST['criteriaValues'])
&& ! array_intersect($_POST['criteriaColumnOperators'], $GLOBALS['PMA_Types']->getUnaryOperators())) {
if (! array_filter($_POST['criteriaValues'])
&& ! array_intersect($_POST['criteriaColumnOperators'], $GLOBALS['PMA_Types']->getUnaryOperators())
) {
return $fullWhereClause;
}

2
transformation_wrapper.php
View File

@ -138,7 +138,7 @@ if (! isset($resize)) {
);
if ($resize == 'jpeg') {
ImageJPEG($destImage, NULL, 75);
ImageJPEG($destImage, null, 75);
}
if ($resize == 'png') {
ImagePNG($destImage);