Merge pull request #117 from lordlele/master

evan108108 · evan108108 · commit 6cf5d61a2177 · 2014-05-05T13:42:07.000-04:00
Update ERestJSONOutputWidget.php
diff --git a/starship/RestfullYii/widgets/ERestJSONOutputWidget.php b/starship/RestfullYii/widgets/ERestJSONOutputWidget.php
@@ -226,7 +226,7 @@ public function processAttributes($model, $relation=null)
 					if (!$this->propertyIsVisable($property, $relation)) {
 							continue;
 					}
-					if($this->isBinary($schema->columns[$property]->dbType, $value)) {
+					if(array_key_exists($property, $schema->columns) and $this->isBinary($schema->columns[$property]->dbType, $value)) {
 						$value =  bin2hex($value);
 					}
 					$model_as_array[$property] = $value;

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public function processAttributes($model, $relation=null)`
`226`	`226`	`if (!$this->propertyIsVisable($property, $relation)) {`
`227`	`227`	`continue;`
`228`	`228`	`}`
`229`		`- if($this->isBinary($schema->columns[$property]->dbType, $value)) {`
	`229`	`+ if(array_key_exists($property, $schema->columns) and $this->isBinary($schema->columns[$property]->dbType, $value)) {`
`230`	`230`	`$value = bin2hex($value);`
`231`	`231`	`}`
`232`	`232`	`$model_as_array[$property] = $value;`