Merge remote-tracking branch 'origin/upstream_master'

mariano · Mar 1, 2012 · 528e51d · 528e51d
2 parents 851b364 + 18c4c8f
commit 528e51d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/extensions/adapter/security/auth/Form.php b/extensions/adapter/security/auth/Form.php
@@ -81,7 +81,10 @@ public function __construct(array $config = array()) {
 		}
 
 		$reflection = new \ReflectionClass($config['model']);
-		if (!$reflection->implementsInterface('li3_doctrine2\models\IUser')) {
+		if (
+			!$reflection->implementsInterface('li3_doctrine2\models\IModel') &&
+			!$reflection->implementsInterface('li3_doctrine2\models\IUser')
+		) {
 			throw new ConfigException("The model {$config['model']} must implement IUser");
 		}
 

diff --git a/models/BaseEntity.php b/models/BaseEntity.php
@@ -17,7 +17,7 @@
  * This class can be used as the base class of your doctrine models, to allow
  * for lithium validation to work on doctrine models.
  */
-abstract class BaseEntity extends \lithium\data\Entity implements IModel, IUser {
+abstract class BaseEntity extends \lithium\data\Entity implements IModel {
 	/**
 	 * Criteria for data validation.
 	 *