Remove redundant isset() and empty() checks.

nacin · nacin · commit dd306def81ff · 2010-03-19T21:29:21.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@13770 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
@@ -95,7 +95,7 @@
 
 	wp_redirect( $redirect_to );
 	exit;
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
@@ -107,7 +107,7 @@
 
 require_once('admin-header.php');
 
-$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
+$mode = ( empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
 
 $comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
 if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam', 'trash')) )
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
@@ -40,7 +40,7 @@
 		wp_redirect($location);
 		exit();
 	}
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
@@ -155,7 +155,7 @@
 
 default:
 
-if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+if ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
@@ -132,7 +132,7 @@
 
 	wp_redirect($sendback);
 	exit();
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -45,7 +45,7 @@ function WP_Filesystem_FTPext($opt='') {
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
-		if ( isset($opt['base']) && ! empty($opt['base']) )
+		if ( ! empty($opt['base']) )
 			$this->wp_base = $opt['base'];
 
 		// Check if the options provided are OK.
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -39,7 +39,7 @@ function WP_Filesystem_ftpsockets($opt = '') {
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
-		if ( isset($opt['base']) && ! empty($opt['base']) )
+		if ( ! empty($opt['base']) )
 			$this->wp_base = $opt['base'];
 
 		// Check if the options provided are OK.
diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -73,7 +73,7 @@ function WP_Filesystem_SSH2($opt='') {
 		else
 			$this->options['hostname'] = $opt['hostname'];
 
-		if ( isset($opt['base']) && ! empty($opt['base']) )
+		if ( ! empty($opt['base']) )
 			$this->wp_base = $opt['base'];
 
 		// Check if the options provided are OK.
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
@@ -1243,9 +1243,8 @@ function get_admin_page_title() {
 	global $pagenow;
 	global $plugin_page;
 
-	if ( isset( $title ) && !empty ( $title ) ) {
+	if ( ! empty ( $title ) )
 		return $title;
-	}
 
 	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
 
@@ -1290,7 +1289,7 @@ function get_admin_page_title() {
 				}
 			}
 		}
-		if ( !isset($title) || empty ( $title ) ) {
+		if ( empty ( $title ) ) {
 			foreach ( $menu as $menu_array ) {
 				if ( isset( $plugin_page ) &&
 					($plugin_page == $menu_array[2] ) &&
diff --git a/wp-admin/install.php b/wp-admin/install.php
@@ -79,7 +79,7 @@ function display_setup_form( $error = null ) {
 
 	// Ensure that Blogs appear in search engines by default
 	$blog_public = 1;
-	if ( isset( $_POST ) && ! empty( $_POST ) )
+	if ( ! empty( $_POST ) )
 		$blog_public = isset( $_POST['blog_public'] );
 
 	$weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
@@ -28,7 +28,7 @@
 		wp_safe_redirect( wp_get_referer() );
 		exit;
 	}
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
@@ -54,14 +54,14 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 				$class[] = 'current';
 		}
 
-		if ( isset($item[4]) && ! empty($item[4]) )
+		if ( ! empty($item[4]) )
 			$class[] = $item[4];
 
 		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 		$tabindex = ' tabindex="1"';
-		$id = isset($item[5]) && ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$id = ! empty($item[5]) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
 		$img = '';
-		if ( isset($item[6]) && ! empty($item[6]) ) {
+		if ( ! empty($item[6]) ) {
 			if ( 'div' === $item[6] )
 				$img = '<br />';
 			else
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
@@ -117,7 +117,7 @@
 
 	wp_redirect($location);
 	exit;
-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {
+} elseif ( ! empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
 }
diff --git a/wp-content/themes/default/archive.php b/wp-content/themes/default/archive.php
@@ -24,7 +24,7 @@
 		<h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
 	  <?php /* If this is an author archive */ } elseif (is_author()) { ?>
 		<h2 class="pagetitle">Author Archive</h2>
- 	  <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+ 	  <?php /* If this is a paged archive */ } elseif ( !empty($_GET['paged']) ) { ?>
 		<h2 class="pagetitle">Blog Archives</h2>
  	  <?php } ?>
 
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
@@ -42,7 +42,7 @@
 			<p>You have searched the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
 			for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
 
-			<?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+			<?php /* If this set is paginated */ } elseif ( !empty($_GET['paged']) ) { ?>
 			<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives.</p>
 
 			<?php } ?>
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
@@ -951,7 +951,7 @@ function wp_kses_bad_protocol_once2($matches) {
 	global $_kses_allowed_protocols;
 
 	if ( is_array($matches) ) {
-		if ( ! isset($matches[1]) || empty($matches[1]) )
+		if ( empty($matches[1]) )
 			return '';
 
 		$string = $matches[1];
diff --git a/wp-includes/load.php b/wp-includes/load.php
@@ -62,7 +62,7 @@ function wp_fix_server_vars() {
 			}
 
 			// Append the query string if it exists and isn't null
-			if ( isset( $_SERVER['QUERY_STRING'] ) && !empty( $_SERVER['QUERY_STRING'] ) ) {
+			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
 				$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
 			}
 		}
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
@@ -828,7 +828,7 @@ function wp_page_menu( $args = array() ) {
 	$list_args = $args;
 
 	// Show Home in the menu
-	if ( isset($args['show_home']) && ! empty($args['show_home']) ) {
+	if ( ! empty($args['show_home']) ) {
 		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
 			$text = __('Home');
 		else
diff --git a/wp-includes/post.php b/wp-includes/post.php
@@ -2078,7 +2078,7 @@ function wp_insert_post($postarr = array(), $wp_error = false) {
 
 	// Create a valid post name.  Drafts and pending posts are allowed to have an empty
 	// post name.
-	if ( !isset($post_name) || empty($post_name) ) {
+	if ( empty($post_name) ) {
 		if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) )
 			$post_name = sanitize_title($post_title);
 		else
diff --git a/wp-includes/query.php b/wp-includes/query.php
@@ -2234,7 +2234,7 @@ function &get_posts() {
 		if ( ! empty($q['meta_key']) )
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
 		if ( ! empty($q['meta_value']) ) {
-			if ( ! isset($q['meta_compare']) || empty($q['meta_compare']) || ! in_array($q['meta_compare'], array('=', '!=', '>', '>=', '<', '<=')) )
+			if ( empty($q['meta_compare']) || ! in_array($q['meta_compare'], array('=', '!=', '>', '>=', '<', '<=')) )
 				$q['meta_compare'] = '=';
 
 			$where .= $wpdb->prepare("AND $wpdb->postmeta.meta_value {$q['meta_compare']} %s ", $q['meta_value']);
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
@@ -966,7 +966,7 @@ function is_dynamic_sidebar() {
 function is_active_sidebar( $index ) {
 	$index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
 	$sidebars_widgets = wp_get_sidebars_widgets();
-	if ( isset($sidebars_widgets[$index]) && !empty($sidebars_widgets[$index]) )
+	if ( !empty($sidebars_widgets[$index]) )
 		return true;
 
 	return false;

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`wp_redirect($location);`
`41`	`41`	`exit();`
`42`	`42`	`}`
`43`		`-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {`
	`43`	`+} elseif ( ! empty($_GET['_wp_http_referer']) ) {`
`44`	`44`	`wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );`
`45`	`45`	`exit;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@`
`155`	`155`
`156`	`156`	`default:`
`157`	`157`
`158`		`-if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {`
	`158`	`+if ( ! empty($_GET['_wp_http_referer']) ) {`
`159`	`159`	`wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );`
`160`	`160`	`exit;`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`
`133`	`133`	`wp_redirect($sendback);`
`134`	`134`	`exit();`
`135`		`-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {`
	`135`	`+} elseif ( ! empty($_GET['_wp_http_referer']) ) {`
`136`	`136`	`wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );`
`137`	`137`	`exit;`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1243,9 +1243,8 @@ function get_admin_page_title() {`
`1243`	`1243`	`global $pagenow;`
`1244`	`1244`	`global $plugin_page;`
`1245`	`1245`
`1246`		`- if ( isset( $title ) && !empty ( $title ) ) {`
	`1246`	`+ if ( ! empty ( $title ) )`
`1247`	`1247`	`return $title;`
`1248`		`- }`
`1249`	`1248`
`1250`	`1249`	`$hook = get_plugin_page_hook( $plugin_page, $pagenow );`
`1251`	`1250`
`@@ -1290,7 +1289,7 @@ function get_admin_page_title() {`
`1290`	`1289`	`}`
`1291`	`1290`	`}`
`1292`	`1291`	`}`
`1293`		`- if ( !isset($title) \|\| empty ( $title ) ) {`
	`1292`	`+ if ( empty ( $title ) ) {`
`1294`	`1293`	`foreach ( $menu as $menu_array ) {`
`1295`	`1294`	`if ( isset( $plugin_page ) &&`
`1296`	`1295`	`($plugin_page == $menu_array[2] ) &&`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`wp_safe_redirect( wp_get_referer() );`
`29`	`29`	`exit;`
`30`	`30`	`}`
`31`		`-} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) {`
	`31`	`+} elseif ( ! empty($_GET['_wp_http_referer']) ) {`
`32`	`32`	`wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );`
`33`	`33`	`exit;`
`34`	`34`	`}`