BUG: Wrong call

Author: Julien Jomier

core/models/pdo/FeedModel.php

@@ -297,7 +297,7 @@ function delete($feeDao)
       {
       $this->database->removeLink('communities', $feeDao, $c);
       }
-    return $this->database->delete($feeDao);
+    return $this->delete($feeDao);
     } // end delete
 
 } // end class

core/models/pdo/FeedpolicyuserModel.php

@@ -27,7 +27,7 @@ public function createPolicy($user, $feed, $policy)
       }
     if($this->getPolicy($user,$feed) !== false)
       {
-      $this->database->delete($this->getPolicy($user,$feed));
+      $this->delete($this->getPolicy($user,$feed));
       }
     $this->loadDaoClass('FeedpolicyuserDao');
     $policyUser=new FeedpolicyuserDao();

core/models/pdo/FolderpolicyuserModel.php

@@ -27,14 +27,14 @@ public function createPolicy($user, $folder, $policy)
       }
     if($this->getPolicy($user, $folder)!==false)
       {
-      $this->database->delete($this->getPolicy($user, $folder));
+      $this->delete($this->getPolicy($user, $folder));
       }
     $this->loadDaoClass('FolderpolicyuserDao');
     $policyUser=new FolderpolicyuserDao();
     $policyUser->setUserId($user->getUserId());
     $policyUser->setFolderId($folder->getFolderId());
     $policyUser->setPolicy($policy);
-    $this->database->save($policyUser);
+    $this->save($policyUser);
     return $policyUser;
     }
 

core/models/pdo/GroupModel.php

@@ -39,8 +39,8 @@ function addUser($group,$user)
       {
       throw new Zend_Exception("Should be an user.");
       }
-    $this->link('users',$group,$user);
+    $this->database->link('users',$group,$user);
     } // end function addItem
 
 }// end class
-?>
+?>

core/models/pdo/ItempolicygroupModel.php

@@ -27,14 +27,14 @@ public function createPolicy($group, $item, $policy)
       }
     if($this->getPolicy($group,$item) !== false)
       {
-      $this->database->delete($this->getPolicy($group,$item));
+      $this->delete($this->getPolicy($group,$item));
       }
     $this->loadDaoClass('ItempolicygroupDao');
     $policyGroupDao=new ItempolicygroupDao();
     $policyGroupDao->setGroupId($group->getGroupId());
     $policyGroupDao->setItemId($item->getItemId());
     $policyGroupDao->setPolicy($policy);
-    $this->database->save($policyGroupDao);
+    $this->save($policyGroupDao);
     return $policyGroupDao;
     }