Changeset 4534

Timestamp:

12/15/2016 06:33:13 AM (8 years ago)

Author:

dd32

Message:

Login: Move saving of extra profile fields from the template to a function.

See #148

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login

Files:

• functions-registration.php (modified) (2 diffs)
• partials/register-profilefields.php (modified) (2 diffs)
• register-confirm.php (modified) (1 diff)
• register-profile.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -38 +38 @@
 
     $user_id = wpmu_create_user( wp_slash( $user_login ), wp_generate_password(), wp_slash( $user_email ) );
-    if ( ! $user_id || is_wp_error( $user_id ) ) {
+    if ( ! $user_id ) {
         wp_die( __( 'Error! Something went wrong with your registration. Try again?', 'wporg-login' ) );
     }
@@ -79 +79 @@
     die();
 }
+
+function wporg_login_save_profile_fields() {
+    if ( ! $_POST || empty( $_POST['user_fields'] ) ) {
+        return;
+    }
+    $fields = array( 'url', 'from', 'occ', 'interests' );
+
+    foreach ( $fields as $field ) {
+        if ( isset( $_POST['user_fields'][ $field ] ) ) {
+            $value = sanitize_text_field( wp_unslash( $_POST['user_fields'][ $field ] ) );
+            if ( 'url' == $field ) {
+                wp_update_user( array(
+                    'ID' => get_current_user_id(),
+                    'user_url' => esc_url_raw( $value )
+                ) );
+            } else {
+                update_user_meta( $user->ID, $field, $value );
+            }
+        }
+    }
+}

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/partials/register-profilefields.php

@@ -4 +4 @@
  *
  * This template expects that the global $user variable is set.
- * This template also handles saving of the fields, not ideal, but does the job for now.
  *
  * @package wporg-login
@@ -10 +9 @@
 
 $fields = array(
-    'url'       => '',
-    'from'      => '',
-    'occ'       => '',
-    'interests' => '',
+    'url'       => wp_get_current_user()->user_url ?: '',
+    'from'      => get_user_meta( get_current_user_id(), 'from', true ) ?: '',
+    'occ'       => get_user_meta( get_current_user_id(), 'occ', true ) ?: '',
+    'interests' => get_user_meta( get_current_user_id(), 'interests', true ) ?: '',
 );
-
-foreach ( array_keys( $fields ) as $field ) {
-    if ( $_POST && isset( $_POST['user_fields'][ $field ] ) ) {
-        $fields[ $field ] = sanitize_text_field( wp_unslash( $_POST['user_fields'][ $field ] ) );
-        if ( 'url' == $field ) {
-            wp_update_user( array(
-                'ID' => get_current_user_id(),
-                'user_url' => esc_url( $fields[ $field ] )
-            ) );
-        } else {
-            update_user_meta( $user->ID, $field, $fields[ $field ] );
-        }
-    } else {
-        $fields[ $field ] = ( 'url' === $field ) ? $user->user_url : get_user_meta( $user->ID, $field, true );
-    }
-}
 
 ?>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register-confirm.php

@@ -33 +33 @@
 } elseif ( !empty( $_POST['user_pass'] ) ) {
     $user_pass = wp_unslash( $_POST['user_pass'] );
+
+    wporg_login_save_profile_fields();
 
     add_filter( 'send_email_change_email', '__return_false' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register-profile.php

@@ -25 +25 @@
 }
 
+wporg_login_save_profile_fields();
+
 wp_enqueue_script( 'wporg-registration' );