From cf38d0009b19be56449d03fee6ca6ee2ed6f9ecf Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 28 Oct 2012 15:05:50 +0530
Subject: [PATCH 1/2] Closing parenthesis of a multi-line IF statement must be
 on a new line

---
 libraries/TableSearch.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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;
         }
 

From 30f6b231df9b5d37d8b1e96c99818aaf8275800f Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 28 Oct 2012 15:07:59 +0530
Subject: [PATCH 2/2] Coding style - null should be lower case

---
 transformation_wrapper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);