diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index 903daaa121..fd6372fc3d 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -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; } diff --git a/transformation_wrapper.php b/transformation_wrapper.php index c4844d07ad..bd3d9f987c 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -138,7 +138,7 @@ if (! isset($resize)) { ); if ($resize == 'jpeg') { - ImageJPEG($destImage, NULL, 75); + ImageJPEG($destImage, null, 75); } if ($resize == 'png') { ImagePNG($destImage);