fix some issue about string or object data

nahid · May 22, 2017 · ff3ad61 · ff3ad61
1 parent eaa328c
commit ff3ad61
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/JsonManager.php b/src/JsonManager.php
@@ -143,6 +143,13 @@ public function makeUniqueName($prefix='jsonq', $hash=false)
 
 	protected function processConditions() 
 	{
+		$data = $this->getData();
+		if (is_string($data)) {
+			return $data;
+		}
+		if (!$this->isMultiArray($data)) {
+			return $data;
+		}
 		$andData = $this->fetchAndData();
 		$orData = $this->fetchOrData();
 		//var_dump($andData);

diff --git a/src/Jsonq.php b/src/Jsonq.php
@@ -83,6 +83,13 @@ public function get($object = true)
 		//if (count(@$_andConditions)>0 or count(@$_orConditions)>0) {
 			$calculatedData = $this->processConditions();
 
+			if (is_string($calculatedData)) {
+				return $calculatedData;
+			}
+
+			if (!$this->isMultiArray($calculatedData)) {
+				return $calculatedData;
+			}
 			$resultingData = [];
 
 			foreach ($calculatedData as $data) {