Remove filter after update

JanVoracek · JanVoracek · commit db90089bd58c · 2018-07-11T09:41:36.000+02:00
diff --git a/src/User_Command.php b/src/User_Command.php
@@ -501,13 +501,19 @@ public function update( $args, $assoc_args ) {
 			$user_ids[] = $user->ID;
 		}
 
-		if ( Utils\get_flag_value( $assoc_args, 'skip-email' ) ) {
+		$skip_email = Utils\get_flag_value( $assoc_args, 'skip-email' );
+		if ( $skip_email ) {
 			add_filter( 'send_email_change_email', '__return_false' );
 			add_filter( 'send_password_change_email', '__return_false' );
 		}
 
 		$assoc_args = wp_slash( $assoc_args );
 		parent::_update( $user_ids, $assoc_args, 'wp_update_user' );
+
+		if ( $skip_email ) {
+			remove_filter( 'send_email_change_email', '__return_false' );
+			remove_filter( 'send_password_change_email', '__return_false' );
+		}
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -501,13 +501,19 @@ public function update( $args, $assoc_args ) {`
`501`	`501`	`$user_ids[] = $user->ID;`
`502`	`502`	`}`
`503`	`503`
`504`		`- if ( Utils\get_flag_value( $assoc_args, 'skip-email' ) ) {`
	`504`	`+ $skip_email = Utils\get_flag_value( $assoc_args, 'skip-email' );`
	`505`	`+ if ( $skip_email ) {`
`505`	`506`	`add_filter( 'send_email_change_email', '__return_false' );`
`506`	`507`	`add_filter( 'send_password_change_email', '__return_false' );`
`507`	`508`	`}`
`508`	`509`
`509`	`510`	`$assoc_args = wp_slash( $assoc_args );`
`510`	`511`	`parent::_update( $user_ids, $assoc_args, 'wp_update_user' );`
	`512`	`+`
	`513`	`+ if ( $skip_email ) {`
	`514`	`+ remove_filter( 'send_email_change_email', '__return_false' );`
	`515`	`+ remove_filter( 'send_password_change_email', '__return_false' );`
	`516`	`+ }`
`511`	`517`	`}`
`512`	`518`
`513`	`519`	`/**`