WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use 2 * DAY_IN_SECONDS rather than 172800. props pavelevap. fixes #20987. 

git-svn-id: http://core.svn.wordpress.org/trunk@22121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-10-05 13:11:16 +00:00
parent 1deab58658
commit 61e0dc0122
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/ms-functions.php
View File

@ -486,7 +486,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$now = current_time( 'timestamp', true ); $now = current_time( 'timestamp', true );
$diff = $now - $registered_at; $diff = $now - $registered_at;
// If registered more than two days ago, cancel registration and let this signup go through. // If registered more than two days ago, cancel registration and let this signup go through.
if ( $diff > 172800 ) if ( $diff > 2 * DAY_IN_SECONDS )
$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) ); $wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
else else
$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.')); $errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
@ -499,7 +499,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
if ( $signup != null ) { if ( $signup != null ) {
$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered); $diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
// If registered more than two days ago, cancel registration and let this signup go through. // If registered more than two days ago, cancel registration and let this signup go through.
if ( $diff > 172800 ) if ( $diff > 2 * DAY_IN_SECONDS )
$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) ); $wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
else else
$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.')); $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
@ -602,7 +602,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
if ( ! empty($signup) ) { if ( ! empty($signup) ) {
$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered); $diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
// If registered more than two days ago, cancel registration and let this signup go through. // If registered more than two days ago, cancel registration and let this signup go through.
if ( $diff > 172800 ) if ( $diff > 2 * DAY_IN_SECONDS )
$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) ); $wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
else else
$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.')); $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));