Merge pull request #2891 from cakephp/3.0-form-input

3.0 form input
cakephp · Feb 25, 2014 · 91b78c0 · 91b78c0
2 parents b244282 + 77b2184
commit 91b78c0
Show file tree

Hide file tree

Showing 3 changed files with 307 additions and 782 deletions.
diff --git a/src/View/Form/EntityContext.php b/src/View/Form/EntityContext.php
@@ -150,9 +150,7 @@ protected function _prepare() {
  * @return boolean
  */
 	public function primaryKey() {
-		$table = $this->_tables[$this->_rootName];
-		$schema = $table->schema();
-		return $schema->primaryKey();
+		return (array)$this->_tables[$this->_rootName]->primaryKey();
 	}
 
 /**