Add test for user preference checkbox handling

WordPress · Jan 3, 2025 · 31498f1 · 31498f1
1 parent 016bbec
commit 31498f1
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 7 deletions.
diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
@@ -132,8 +132,8 @@ function edit_user( $user_id = 0 ) {
 	}
 
 	if ( $update ) {
-		$user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
-		$user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
+		$user->rich_editing         = isset( $_POST['rich_editing'] ) ? 'true' : 'false';
+		$user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) ? 'true' : 'false';
 		$user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
 		$user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
 	}

diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
@@ -300,8 +300,8 @@
 						<tr class="user-rich-editing-wrap">
 							<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
 							<td>
-								<label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked( 'false', $profile_user->rich_editing ); ?> />
-									<?php _e( 'Disable the visual editor when writing' ); ?>
+								<label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true"<?php checked( 'true', $profile_user->rich_editing ); ?> />
+									<?php _e( 'Enable the visual editor when writing' ); ?>
 								</label>
 							</td>
 						</tr>
@@ -324,8 +324,8 @@
 					<tr class="user-syntax-highlighting-wrap">
 						<th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
 						<td>
-							<label for="syntax_highlighting"><input name="syntax_highlighting" type="checkbox" id="syntax_highlighting" value="false" <?php checked( 'false', $profile_user->syntax_highlighting ); ?> />
-								<?php _e( 'Disable syntax highlighting when editing code' ); ?>
+							<label for="syntax_highlighting"><input name="syntax_highlighting" type="checkbox" id="syntax_highlighting" value="true"<?php checked( 'true', $profile_user->syntax_highlighting ); ?> />
+								<?php _e( 'Enable syntax highlighting when editing code' ); ?>
 							</label>
 						</td>
 					</tr>
@@ -370,7 +370,7 @@
 						<th scope="row"><?php _e( 'Toolbar' ); ?></th>
 						<td>
 							<label for="admin_bar_front">
-								<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profile_user->ID ) ); ?> />
+								<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="true"<?php checked( _get_admin_bar_pref( 'front', $profile_user->ID ) ); ?> />
 								<?php _e( 'Show Toolbar when viewing site' ); ?>
 							</label><br />
 						</td>

diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php
@@ -2289,4 +2289,46 @@ function ( $meta_id, $object_id, $meta_key ) use ( &$db_update_count ) {
 		// Verify there are no updates to 'use_ssl' user meta.
 		$this->assertSame( 1, $db_update_count );
 	}
+
+	/**
+	 * Test user preference checkbox handling.
+	 *
+	 * @ticket 57393
+	 *
+	 * @covers ::edit_user
+	 */
+	public function test_user_preferences_checkbox_handling() {
+		wp_set_current_user( self::$admin_id );
+
+		// Test when preferences are enabled.
+		$_POST = array(
+			'nickname'           => 'Test User',
+			'email'             => '[email protected]',
+			'rich_editing'      => 'true',
+			'syntax_highlighting' => 'true',
+			'admin_bar_front'   => 'true',
+		);
+
+		$result = edit_user( self::$author_id );
+		$this->assertNotWPError( $result );
+
+		$user = get_user_by( 'id', self::$author_id );
+		$this->assertSame( 'true', $user->rich_editing );
+		$this->assertSame( 'true', $user->syntax_highlighting );
+		$this->assertSame( 'true', $user->show_admin_bar_front );
+
+		// Test when preferences are disabled.
+		$_POST = array(
+			'nickname' => 'Test User',
+			'email'    => '[email protected]',
+		);
+
+		$result = edit_user( self::$author_id );
+		$this->assertNotWPError( $result );
+
+		$user = get_user_by( 'id', self::$author_id );
+		$this->assertSame( 'false', $user->rich_editing );
+		$this->assertSame( 'false', $user->syntax_highlighting );
+		$this->assertSame( 'false', $user->show_admin_bar_front );
+	}
 }