Merge remote-tracking branch 'origin/master'

Conflicts: controllers/ApiController.php
thegoatherder · Jan 6, 2012 · d869db5 · d869db5
2 parents 09033d9 + afc7a66
commit d869db5
Show file tree

Hide file tree

Showing 4 changed files with 283 additions and 287 deletions.
diff --git a/RestapiModule.php b/RestapiModule.php
@@ -59,6 +59,9 @@ public function getCheckAttributeAccessControl($model) {
   }
 
   protected function init() {
+    Yii::import($this->getId().".components.*");
+    Yii::import($this->getId().".models.*");
+
     if (empty($this->modelMap)) {
       Yii::log("Model Map is not set. No Model will rest.", CLogger::LEVEL_ERROR, "restapi");
     }

diff --git a/components/RestApiAccessControl.php b/components/RestApiAccessControl.php
@@ -1,6 +1,4 @@
 <?php
-Yii::import("restapi.components.RestApiUserIdentity");
-
 class RestApiAccessControl extends CFilter {
 
   protected function preFilter($filterChain) {

diff --git a/components/RestApiUserIdentity.php b/components/RestApiUserIdentity.php
@@ -1,7 +1,4 @@
 <?php
-
-Yii::import("restapi.models.ApiUsers");
-
 class RestApiUserIdentity extends CBaseUserIdentity {
 
   protected $token;
@@ -63,4 +60,4 @@ public function getName() {
     if ($this->user) return $this->user->username;
     else return '';
   }
-}
+}