← All changes | lib/helpers.php +4 -7 trunk → 3.15 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' );
		@@ -81,11 +81,8 @@
81	81	make_db_current_silent();
82	82	populate_options();
83	83	populate_roles();
84	84
85		- remove_all_actions('update_option_blogname');
86		- remove_all_actions('update_option_blogdescription');
87		-
88	85	update_option( 'blogname', $blog_title );
89	86	update_option( 'admin_email', $user_email );
90	87	update_option( 'blog_public', $public );
91	88
		@@ -110,17 +107,17 @@
110	107	$user_password = trim( $user_password );
111	108	$email_password = false;
112	109	if ( ! $user_id && empty( $user_password ) ) {
113	110	$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' );
	111	+ $message = __( '<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.' );
115	112	$user_id = wp_create_user( $user_name, $user_password, $user_email );
116	113	$email_password = true;
117	114	} elseif ( ! $user_id ) {
118	115	// Password has been provided
119		- $message = '<em>'.__( 'Your chosen password.', 'wordpress-database-reset' ).'</em>';
	116	+ $message = '<em>'.__( 'Your chosen password.' ).'</em>';
120	117	$user_id = wp_create_user( $user_name, $user_password, $user_email );
121	118	} else {
122		- $message = __( 'User already exists. Password inherited.', 'wordpress-database-reset' );
	119	+ $message = __( 'User already exists. Password inherited.' );
123	120	}
124	121
125	122	$user = new WP_User( $user_id );
126	123	$user->set_role( 'administrator' );