Changeset 3382 for branches/plugin/bbp-includes/bbp-user-template.php

Timestamp:

08/07/2011 02:07:20 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Add bbp_add_error() and bbp_has_error() functions to handle error adding and checking, and use through-out project. Rejig functions with early GET and POST checks to bail early rather than wrap routine in an if statement. Fixes issue where removing favorites and subscriptions from user profile pages would redirect incorrectly. Fixes issue where spamming and trashing topics and replies would not force view=all in some cases.

File:

• branches/plugin/bbp-includes/bbp-user-template.php (modified) (2 diffs)

branches/plugin/bbp-includes/bbp-user-template.php

@@ -853 +853 @@
     // loggedout was passed
     if ( !empty( $_GET['loggedout'] ) && ( true == $_GET['loggedout'] ) ) {
-        $bbp->errors->add( 'loggedout', __( 'You are now logged out.', 'bbpress' ), 'message' );
+        bbp_add_error( 'loggedout', __( 'You are now logged out.', 'bbpress' ), 'message' );
 
     // registration is disabled
     } elseif ( !empty( $_GET['registration'] ) && ( 'disabled' == $_GET['registration'] ) ) {
-        $bbp->errors->add( 'registerdisabled', __( 'New user registration is currently not allowed.', 'bbpress' ) );
+        bbp_add_error( 'registerdisabled', __( 'New user registration is currently not allowed.', 'bbpress' ) );
 
     // Prompt user to check their email
@@ -866 +866 @@
             // Email needs confirmation
             case 'confirm' :
-                $bbp->errors->add( 'confirm',    __( 'Check your e-mail for the confirmation link.',     'bbpress' ), 'message' );
+                bbp_add_error( 'confirm',    __( 'Check your e-mail for the confirmation link.',     'bbpress' ), 'message' );
                 break;
 
             // User requested a new password
             case 'newpass' :
-                $bbp->errors->add( 'newpass',    __( 'Check your e-mail for your new password.',         'bbpress' ), 'message' );
+                bbp_add_error( 'newpass',    __( 'Check your e-mail for your new password.',         'bbpress' ), 'message' );
                 break;
 
             // User is newly registered
             case 'registered' :
-                $bbp->errors->add( 'registered', __( 'Registration complete. Please check your e-mail.', 'bbpress' ), 'message' );
+                bbp_add_error( 'registered', __( 'Registration complete. Please check your e-mail.', 'bbpress' ), 'message' );
                 break;
         }