← All changes | lib/helpers.php +4 -4 trunk → 3.21 View file →

		@@ -42,9 +42,9 @@
42	42	* @return void
43	43	*/
44	44	function db_reset_cancel_activation( $message ) {
45	45	deactivate_plugins( __FILE__ );
46		- wp_die( esc_html($message) );
	46	+ wp_die( $message );
47	47	}
48	48
49	49	// Ewww. Still need it though.
50	50	require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
		@@ -110,17 +110,17 @@
110	110	$user_password = trim( $user_password );
111	111	$email_password = false;
112	112	if ( ! $user_id && empty( $user_password ) ) {
113	113	$user_password = wp_generate_password( 12, false );
114		- $message = __( '<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.', 'wordpress-database-reset' );
	114	+ $message = __( '<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.' );
115	115	$user_id = wp_create_user( $user_name, $user_password, $user_email );
116	116	$email_password = true;
117	117	} elseif ( ! $user_id ) {
118	118	// Password has been provided
119		- $message = '<em>'.__( 'Your chosen password.', 'wordpress-database-reset' ).'</em>';
	119	+ $message = '<em>'.__( 'Your chosen password.' ).'</em>';
120	120	$user_id = wp_create_user( $user_name, $user_password, $user_email );
121	121	} else {
122		- $message = __( 'User already exists. Password inherited.', 'wordpress-database-reset' );
	122	+ $message = __( 'User already exists. Password inherited.' );
123	123	}
124	124
125	125	$user = new WP_User( $user_id );
126	126	$user->set_role( 'administrator' );