commit 78b6d1496c2a44da592f54f7a74a023a3e815efa
Author: pwolanin <pwolanin@49851.no-reply.drupal.org>
Date:   Wed Jun 29 18:55:17 2011 -0400

    #1204176 fix for re-declared phpass_user()

diff --git a/phpass.module b/phpass.module
index 1a4d1cd..94fdc5e 100644
--- a/phpass.module
+++ b/phpass.module
@@ -15,6 +15,7 @@ function phpass_user($op, &$edit, &$account, $category = NULL) {
         $account->pass = $userpass->hash;
       }
       break;
+    case 'submit':
     case 'update':
     case 'insert':
       // Catch password changes and update the password hash.
@@ -121,20 +122,6 @@ function phpass_form_alter($form_id, &$form) {
 }
 
 /**
- * Implement hook_user to save the hash password.
- */
-function phpass_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
-    case 'submit':
-      if (!empty($edit['pass'])) {
-        _phpass_save($account->uid, $edit['pass']);
-        unset($edit['pass']);
-      }
-      break;
-  }
-}
-
-/**
  * This is a copy of user_login_validate, that calls our validate
  * instead of the default user validation.
  *