Reset status query var for another tab

Stuart297 · Feb 15, 2019 · dfa3934 · dfa3934
1 parent 62061ad
commit dfa3934
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/helper/class-ms-helper-html.php b/app/helper/class-ms-helper-html.php
@@ -393,12 +393,13 @@ public static function html_admin_vertical_tabs( $tabs, $active_tab = null, $per
 					$url 		= $tab['url'];
 					$attributes = array();
 
+					$url = remove_query_arg( 'status', $url );
+
 					foreach ( $persistent as $param ) {
 						mslib3()->array->equip_request( $param );
 						$value 	= $_REQUEST[ $param ];
-						$url 	= esc_url_raw(
-							add_query_arg( $param, $value, $url )
-						);
+
+						$url 	= add_query_arg( $param, $value, $url );
 					}
 
 					$attributes[] = 'class="ms-tab-link"';

diff --git a/premium/addon/searchindex/class-ms-addon-searchindex.php b/premium/addon/searchindex/class-ms-addon-searchindex.php
@@ -260,7 +260,7 @@ public function is_base_type( $result, $membership_type ) {
 			$result = true;
 
 			// but should be visible in protection tab
-			if( isset( $_GET['page'] ) && $_GET['page'] === MS_Controller_Plugin::MENU_SLUG .'-protection' ){
+			if( MS_Controller_Plugin::is_page( 'protection' ) ){
 				$result = false;
 			}
 		}