Index: password_policy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/password_policy/password_policy.module,v retrieving revision 1.17 diff -u -p -r1.17 password_policy.module --- password_policy.module 1 Feb 2009 15:49:40 -0000 1.17 +++ password_policy.module 23 Apr 2009 04:46:42 -0000 @@ -328,7 +328,7 @@ function password_policy_cron() { if (!empty($expiration)) { // Accounts expiration is active. // Get all users' last password change time. We don't touch blocked accounts - $result = db_query("SELECT u.uid uid, u.created created_u, p.created created_p, e.pid pid, e.warning warning, e.unblocked unblocked FROM {users} u LEFT JOIN {password_policy_history} p ON u.uid = p.uid LEFT JOIN {password_policy_expiration} e ON u.uid = e.uid WHERE u.uid > 0 AND u.status = 1 ORDER BY p.created ASC"); + $result = db_query("SELECT u.uid AS uid, u.created AS created_u, p.created AS created_p, e.pid AS pid, e.warning AS warning, e.unblocked AS unblocked FROM {users} u LEFT JOIN {password_policy_history} p ON u.uid = p.uid LEFT JOIN {password_policy_expiration} e ON u.uid = e.uid WHERE u.uid > 0 AND u.status = '1' ORDER BY p.created ASC"); while ($row = db_fetch_object($result)) { if ($row->uid == 1 && !PASSWORD_POLICY_ADMIN) continue; @@ -694,7 +694,7 @@ function _password_policy_start($expirat * Clear text password. */ function _password_policy_store_password($uid, $pass) { - db_query("INSERT INTO {password_policy_history} SET uid = %d, pass = '%s', created = %d", $uid, md5($pass), time()); + db_query("INSERT INTO {password_policy_history} (uid, pass, created) VALUES (%d, '%s', %d)", $uid, md5($pass), time()); } /**