Merge branch 'master' of github.com:oscarotero/simplecrud

Conflicts: SimpleCrud/Entity.php
oscarotero · Jan 27, 2014 · 55a5ef3 · 55a5ef3
2 parents 46a5460 + c662a3e
commit 55a5ef3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ SimpleCrud has the following classes:
 
 Create a new entity for each table in the database in a common namespace:
 
-```
+```php
 namespace MyApp\Entities;
 
 use SimpleCrud\Entity;
@@ -298,4 +298,4 @@ $post->comments; //Access to the cached result instead execute getComments() aga
 $post->lowercaseTitle; //Execute getLowercaseTitle() and save the result in $post->lowercaseTitle;
 ```
 
-Check the commented code to know full API.
+Check the commented code to know full API.
diff --git a/SimpleCrud/Entity.php b/SimpleCrud/Entity.php
@@ -490,10 +490,10 @@ public function update (array $data, $where = '', $marks = null, $limit = null,
 
 		unset($data['id']);
 
-		if (empty($data)) {
+		if (!$data) {
 			return $data;
 		}
-		
+
 		$quoted = $this->manager->quote($data, $this->getFields(self::FIELDS_DATA_TYPE));
 		$set = [];