Fixed problem with cdate and mdate on new property protection.

Author: hperrin

examples/employee/Employee.php

@@ -19,7 +19,7 @@ class Employee extends Entity {
 	const etype = 'employee';
 	protected $protectedTags = array('employee');
 	protected $whitelistTags = array('boss', 'bigcheese');
-	protected $whitelistData = array('name', 'id', 'title', 'department', 'subordinates', 'salary', 'current', 'start_date', 'end_date', 'phone');
+	protected $whitelistData = array('name', 'id', 'title', 'department', 'subordinates', 'salary', 'current', 'start_date', 'end_date', 'phone', 'manager');
 
 	public function __construct($id = 0) {
 		$this->addTag('employee');

src/Entity.php

@@ -566,6 +566,9 @@ public function jsonSerialize() {
 	}
 
 	public function jsonAcceptTags($tags) {
+		if ($this->isASleepingReference)
+			$this->referenceWake();
+
 		$currentTags = $this->getTags();
 		$protectedTags = array_intersect($this->protectedTags, $currentTags);
 		$tags = array_diff($tags, $this->protectedTags);
@@ -579,6 +582,9 @@ public function jsonAcceptTags($tags) {
 	}
 
 	public function jsonAcceptData($data) {
+		if ($this->isASleepingReference)
+			$this->referenceWake();
+
 		foreach ($this->objectData as $var) {
 			if (isset($data[$var]) && (array) $data[$var] === $data) {
 				$data[$var] = (object) $data[$var];
@@ -587,15 +593,15 @@ public function jsonAcceptData($data) {
 
 		$privateData = array();
 		foreach ($this->privateData as $var) {
-			if (key_exists($var, $this->data) || key_exists($var, $this->sdata) || $var === 'cdate' || $var === 'mdate')
+			if (key_exists($var, $this->data) || key_exists($var, $this->sdata))
 				$privateData[$var] = $this->$var;
 			if (key_exists($var, $data))
 				unset($data[$var]);
 		}
 
 		$protectedData = array();
 		foreach ($this->protectedData as $var) {
-			if (key_exists($var, $this->data) || key_exists($var, $this->sdata) || $var === 'cdate' || $var === 'mdate')
+			if (key_exists($var, $this->data) || key_exists($var, $this->sdata))
 				$protectedData[$var] = $this->$var;
 			if (key_exists($var, $data))
 				unset($data[$var]);
@@ -610,14 +616,11 @@ public function jsonAcceptData($data) {
 
 		$data = array_merge($data, $protectedData, $privateData);
 
-		if (isset($data['cdate'])) {
-			$this->cdate = $data['cdate'];
-			unset($data['cdate']);
-		}
-		if (isset($data['mdate'])) {
-			$this->mdate = $data['mdate'];
-			unset($data['mdate']);
-		}
+		if (!isset($data['cdate']))
+			$data['cdate'] = $this->cdate;
+		if (!isset($data['mdate']))
+			$data['mdate'] = $this->mdate;
+
 		$this->putData($data);
 	}
 

src/Interfaces.php

@@ -420,10 +420,11 @@ public function save();
  * even after deletion. It's the job of the entity manager to make sure no two
  * entities ever have the same GUID.
  *
- * Tags are used to classify entities. Though not strictly necessary, it is
- * *HIGHLY RECOMMENDED* to give every entity your component creates a tag
- * indentical to your component's name, such as 'com_xmlparser'. You don't want
- * to accidentally get another component's entities.
+ * Tags are used to classify entities. Where an etype is used to separate data
+ * by table, tags are used to separate entities within a table. You can define
+ * specific tags to be protected, meaning they cannot be added/removed on the
+ * frontend. It can be useful to allow user defined tags, such as for a blog
+ * post.
  *
  * Simply calling delete() will not unset the entity. It will still take up
  * memory. Likewise, simply calling unset will not delete the entity from