Author: allyb
Date: 2010-02-18 23:47:37 +0100 (Thu, 18 Feb 2010)
New Revision: 28133
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/user/sfEasyAuthSecurityUser.class.php
Log:
Updated more references to propel methods
Modified:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/user/sfEasyAuthSecurityUser.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/user/sfEasyAuthSecurityUser.class.php
2010-02-18 22:40:10 UTC (rev 28132)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/user/sfEasyAuthSecurityUser.class.php
2010-02-18 22:47:37 UTC (rev 28133)
@@ -21,7 +21,7 @@
{
if (!$this->eaUser && $id = $this->getAttribute('security_user_id'))
{
- $this->eaUser = sfEasyAuthUserPeer::retrieveByPk($id);
+ $this->eaUser =
Doctrine::getTable('sfEasyAuthUser')->find/*&sfEasyAuthUserPeer::retrieveByPk###Doctrine::getTable('sfEasyAuthUser')->find&*/($id);
if (!$this->eaUser)
{
@@ -120,11 +120,11 @@
{
sfEasyAuthUtils::logDebug("Authenticating... Username: $username,
password: $password");
- $eaUser = sfEasyAuthUserPeer::retrieveByUsername($username);
+ $eaUser =
Doctrine::getTable('sfEasyAuthUser')->findByUsername/*&sfEasyAuthUserPeer::retrieveByUsername###Doctrine::getTable('sfEasyAuthUser')->findByUsername&*/($username);
if (!$eaUser &&
sfConfig::get('app_sf_easy_auth_allow_emails_as_usernames_for_login'))
{
- $eaUser = sfEasyAuthUserPeer::retrieveByEmail($username);
+ $eaUser =
Doctrine::getTable('sfEasyAuthUser')->findByEmail/*&sfEasyAuthUserPeer::retrieveByEmail###Doctrine::getTable('sfEasyAuthUser')->findByEmail&*/($username);
}
if (is_object($eaUser))
@@ -327,7 +327,7 @@
sfEasyAuthUtils::logDebug("Remember me cookie shouldn't have expired,
so that's ok. Checking user account.");
// retrieve the user
- if (!$eaUser = sfEasyAuthUserPeer::retrieveByPk($userId))
+ if (!$eaUser =
Doctrine::getTable('sfEasyAuthUser')->find/*&sfEasyAuthUserPeer::retrieveByPk###Doctrine::getTable('sfEasyAuthUser')->find&*/($userId))
{
sfEasyAuthUtils::logDebug('Unable to retrieve user with id ' .
$userId);
return false;
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
