From bf1495e18b3deabc34ae86f6a34642e9bb221235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Mon, 20 Jun 2011 23:08:08 +0200 Subject: [PATCH] Doh, apparently the convention has changed nowadays models are placed in the Application_ namespace but we still use Default_ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- .../controllers/ManageAccountController.php | 2 +- manager/application/models/User.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manager/application/controllers/ManageAccountController.php b/manager/application/controllers/ManageAccountController.php index f0701b4..bcb1287 100644 --- a/manager/application/controllers/ManageAccountController.php +++ b/manager/application/controllers/ManageAccountController.php @@ -57,7 +57,7 @@ class ManageAccountController extends Zend_Controller_Action $values = $form->getValues(); // Get the current user - $user = Application_Model_User::findCurrentUser(); + $user = Default_Model_User::findCurrentUser(); $this->view->assurancesDone = array(); $quantity = $values['quantity']; diff --git a/manager/application/models/User.php b/manager/application/models/User.php index 29bd1e7..f68b352 100644 --- a/manager/application/models/User.php +++ b/manager/application/models/User.php @@ -3,7 +3,7 @@ * @author Michael Tänzer */ -class Application_Model_User { +class Default_Model_User { protected $db; protected $id; @@ -20,7 +20,7 @@ class Application_Model_User { * Get an user object for the given ID * * @param $id int - * @return Application_Model_User + * @return Default_Model_User */ public static function findById($id) { // Get database connection @@ -40,13 +40,13 @@ class Application_Model_User { } $row = $result->fetch(); - return new Application_Model_User($db, $row['id']); + return new Default_Model_User($db, $row['id']); } /** * Get an user object for the currently logged in user * - * @return Application_Model_User + * @return Default_Model_User */ public static function findCurrentUser() { $session = Zend_Registry::get('session'); @@ -61,7 +61,7 @@ class Application_Model_User { /** * Get the first assurer who didn't already assure the user * - * @return Application_Model_User + * @return Default_Model_User */ public function findNewAssurer() { @@ -77,7 +77,7 @@ class Application_Model_User { 'assured this account'); } - return new Application_Model_User($this->db, $row['assurer']); + return new Default_Model_User($this->db, $row['assurer']); } /** @@ -174,7 +174,7 @@ class Application_Model_User { /** * Assure another user. Usual restrictions apply * - * @param $assuree Application_Model_User + * @param $assuree Default_Model_User * @param $points int * @param $location string * @param $date string @@ -184,7 +184,7 @@ class Application_Model_User { * The amount of points that have been issued (might be less than * $points) */ - public function assure(Application_Model_User $assuree, $points, $location, + public function assure(Default_Model_User $assuree, $points, $location, $date) { // Sanitize inputs $points = intval($points);