Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

LimeSurvey · Mar 20, 2013 · 6cfb506 · 6cfb506
2 parents ceb3bd0 + 3773553
commit 6cfb506
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/models/Permission.php b/application/models/Permission.php
@@ -42,7 +42,7 @@ public function primaryKey()
      * @static
      * @access public
      * @param string $class
-     * @return CActiveRecord
+     * @return Permission
      */
     public static function model($class = __CLASS__)
     {
@@ -142,7 +142,7 @@ public static function setPermissions($iUserID, $iSurveyID, $aPermissions)
         }
         else
         {
-            $aBasePermissions=$this->getBasePermissions();
+            $aBasePermissions=Permission::model()->getBasePermissions();
 
         }