Fix typos

sudar · May 30, 2018 · ea4d86a · ea4d86a
1 parent 2c2e6cc
commit ea4d86a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/include/Core/Base/Mixin/Renderer.php b/include/Core/Base/Mixin/Renderer.php
@@ -110,18 +110,18 @@ protected function render_user_role_dropdown() {
 	 */
 	protected function render_post_type_dropdown() {
 		$types = bd_get_post_types();
-?>
-	<tr>
-		<td scope="row" >
-			<select class="select2" name="smbd_<?php echo esc_attr( $this->field_slug ); ?>_post_type">
-				<?php foreach ( $types as $type ) : ?>
-					<option value="<?php echo esc_attr( $type->name ); ?>">
-						<?php echo esc_html( $type->labels->singular_name . ' (' . $type->name . ')' ); ?>
-					</option>
-				<?php endforeach; ?>
-			</select>
-		</td>
-	</tr>
-<?php
+		?>
+			<tr>
+				<td scope="row" >
+					<select class="select2" name="smbd_<?php echo esc_attr( $this->field_slug ); ?>_post_type">
+						<?php foreach ( $types as $type ) : ?>
+							<option value="<?php echo esc_attr( $type->name ); ?>">
+								<?php echo esc_html( $type->labels->singular_name . ' (' . $type->name . ')' ); ?>
+							</option>
+						<?php endforeach; ?>
+					</select>
+				</td>
+			</tr>
+		<?php
 	}
 }
diff --git a/include/Core/Metas/Modules/DeleteUserMetaModule.php b/include/Core/Metas/Modules/DeleteUserMetaModule.php
@@ -33,10 +33,9 @@ public function render() {
 		<!-- User Meta box start-->
         <fieldset class="options">
         <h4><?php _e( 'Select the user role whose user meta fields you want to delete', 'bulk-delete' ); ?></h4>
+
         <table class="optiontable">
-<?php
-$this->render_user_role_dropdown();
-?>
+			<?php $this->render_user_role_dropdown(); ?>
         </table>
 
         <h4><?php _e( 'Choose your user meta field settings', 'bulk-delete' ); ?></h4>
@@ -128,7 +127,7 @@ public function render() {
 	}
 
 	protected function convert_user_input_to_options( $request, $options ) {
-		$options['post_type'] = esc_sql( bd_array_get( $request, 'smbd_' . $this->field_slug . '_post_type', 'post' ) );
+		$options['selected_roles'] = esc_sql( bd_array_get( $request, 'smbd_' . $this->field_slug . '_roles' ) );
 
 		$options['use_value'] = bd_array_get_bool( $request, 'smbd_' . $this->field_slug . '_use_value', false );
 		$options['meta_key']  = esc_sql( bd_array_get( $request, 'smbd_' . $this->field_slug . '_meta_key', '' ) );
@@ -138,13 +137,12 @@ protected function convert_user_input_to_options( $request, $options ) {
 
 	protected function do_delete( $options ) {
 		$count     = 0;
-		$user_role = $options['user_role'];
 		$meta_key  = $options['meta_key'];
 		$use_value = $options['use_value'];
 		$limit_to  = $options['limit_to'];
 
 		$options = array(
-			'role' => $user_role,
+			'role__in' => $options['selected_roles'],
 		);
 
 		if ( $limit_to > 0 ) {

diff --git a/include/Core/Users/Modules/DeleteUsersByUserRoleModule.php b/include/Core/Users/Modules/DeleteUsersByUserRoleModule.php
@@ -61,7 +61,7 @@ public function render() {
 	}
 
 	protected function convert_user_input_to_options( $request, $options ) {
-		$options['selected_roles'] = bd_array_get( $request, 'smbd_u_roles', array() );
+		$options['selected_roles'] = bd_array_get( $request, 'smbd_' . $this->field_slug . '_roles', array() );
 
 		return $options;
 	}