Flatten Db::parseParam()

craftcms · Jun 2, 2018 · 1e132be · 1e132be
1 parent fd24f63
commit 1e132be
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/helpers/Db.php b/src/helpers/Db.php
@@ -493,7 +493,10 @@ public static function parseParam(string $column, $value, string $defaultOperato
                         ];
                     }
                 }
-            } else if (is_string($val)) {
+                continue;
+            }
+
+            if (is_string($val)) {
                 // Trim any whitespace from the value
                 $val = trim($val);
 
@@ -515,12 +518,11 @@ public static function parseParam(string $column, $value, string $defaultOperato
                         $val,
                         false
                     ];
-                } else {
-                    $condition[] = [$operator, $column, $val];
+                    continue;
                 }
-            } else {
-                $condition[] = [$operator, $column, $val];
             }
+
+            $condition[] = [$operator, $column, $val];
         }
 
         return $condition;