Merge remote-tracking branch 'refs/remotes/origin/develop'

src/Medoo.php

@@ -2,7 +2,7 @@
 /*!
  * Medoo database framework
  * https://medoo.in
- * Version 1.5.2
+ * Version 1.5.3
  *
  * Copyright 2017, Angel Lai
  * Released under the MIT license
@@ -521,19 +521,18 @@ protected function dataImplode($data, &$map, $conjunctor)
 		{
 			$type = gettype($value);
 
-			if ($type === 'array')
+			if (
+				$type === 'array' &&
+				preg_match("/^(AND|OR)(\s+#.*)?$/", $key, $relation_match)
+			)
 			{
-				$relationship = strpos($key, 'AND', 0) !== false ? 'AND' :
-				 				(strpos($key, 'OR', 0) !== false ? 'OR' : false);
+				$relationship = $relation_match[ 1 ];
 
-				 if ($relationship)
-				 {
-					$stack[] = !empty(array_diff_key($value, array_keys(array_keys($value)))) ?
-						'(' . $this->dataImplode($value, $map, ' ' . $relationship) . ')' :
-						'(' . $this->innerConjunct($value, $map, ' ' . $relationship, $conjunctor) . ')';
+				$stack[] = $value !== array_keys(array_keys($value)) ?
+					'(' . $this->dataImplode($value, $map, ' ' . $relationship) . ')' :
+					'(' . $this->innerConjunct($value, $map, ' ' . $relationship, $conjunctor) . ')';
 
-					continue;
-				}
+				continue;
 			}
 
 			$map_key = $this->mapKey();