diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
| commit | 714d920faea302b55857cc3bec4e9e6160ea136a (patch) | |
| tree | cffa5ee7a3261ad24b272cb3ced16a6c1dcafad1 /actions/recoverpassword.php | |
| parent | c187bf55974347f7ddb4f28714af57861dce8f08 (diff) | |
| parent | 51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
Diffstat (limited to 'actions/recoverpassword.php')
| -rw-r--r-- | actions/recoverpassword.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index dcff35f6e..1e2775e7a 100644 --- a/actions/recoverpassword.php +++ b/actions/recoverpassword.php @@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } # You have 24 hours to claim your password -define(MAX_RECOVERY_TIME, 24 * 60 * 60); +define('MAX_RECOVERY_TIME', 24 * 60 * 60); class RecoverpasswordAction extends Action { |