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

catfan · Jan 8, 2018 · a6b7b05 · a6b7b05
2 parents 1aa25a4 + ae16ecc
commit a6b7b05
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Medoo.php b/src/Medoo.php
@@ -2,7 +2,7 @@
 /*!
  * Medoo database framework
  * https://medoo.in
- * Version 1.5.3
+ * Version 1.5.4
  *
  * Copyright 2017, Angel Lai
  * Released under the MIT license
@@ -587,8 +587,8 @@ protected function dataImplode($data, &$map, $conjunctor)
 
 								foreach ($value as $index => $item)
 								{
-									$placeholders[] = $map_key . $index;
-									$map[ $map_key . $index ] = $this->typeMap($item, gettype($item));
+									$placeholders[] = $map_key . $index . '_i';
+									$map[ $map_key . $index . '_i' ] = $this->typeMap($item, gettype($item));
 								}
 
 								$stack[] = $column . ' NOT IN (' . implode(', ', $placeholders) . ')';
@@ -682,8 +682,8 @@ protected function dataImplode($data, &$map, $conjunctor)
 
 							foreach ($value as $index => $item)
 							{
-								$placeholders[] = $map_key . $index;
-								$map[ $map_key . $index ] = $this->typeMap($item, gettype($item));
+								$placeholders[] = $map_key . $index . '_i';
+								$map[ $map_key . $index . '_i' ] = $this->typeMap($item, gettype($item));
 							}
 
 							$stack[] = $column . ' IN (' . implode(', ', $placeholders) . ')';