Changeset 13770

Timestamp:

03/19/2010 09:29:21 PM (14 years ago)

Author:

nacin

Message:

Remove redundant isset() and empty() checks.

Location:

trunk

Files:

• wp-admin/edit-comments.php (modified) (2 diffs)
• wp-admin/edit-link-categories.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/install.php (modified) (1 diff)
• wp-admin/link-manager.php (modified) (1 diff)
• wp-admin/menu-header.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-content/themes/default/archive.php (modified) (1 diff)
• wp-content/themes/default/sidebar.php (modified) (1 diff)
• wp-includes/kses.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (1 diff)

trunk/wp-admin/edit-comments.php

@@ -96 +96 @@
     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;
@@ -108 +108 @@
 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';

trunk/wp-admin/edit-link-categories.php

@@ -41 +41 @@
         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;

trunk/wp-admin/edit-tags.php

@@ -156 +156 @@
 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;

trunk/wp-admin/edit.php

@@ -133 +133 @@
     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;

trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -46 +46 @@
             $this->options['hostname'] = $opt['hostname'];
 
-        if ( isset($opt['base']) && ! empty($opt['base']) )
+        if ( ! empty($opt['base']) )
             $this->wp_base = $opt['base'];
 

trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -40 +40 @@
             $this->options['hostname'] = $opt['hostname'];
 
-        if ( isset($opt['base']) && ! empty($opt['base']) )
+        if ( ! empty($opt['base']) )
             $this->wp_base = $opt['base'];
 

trunk/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -74 +74 @@
             $this->options['hostname'] = $opt['hostname'];
 
-        if ( isset($opt['base']) && ! empty($opt['base']) )
+        if ( ! empty($opt['base']) )
             $this->wp_base = $opt['base'];
 

trunk/wp-admin/includes/plugin.php

@@ -1244 +1244 @@
     global $plugin_page;
 
-    if ( isset( $title ) && !empty ( $title ) ) {
+    if ( ! empty ( $title ) )
         return $title;
-    }
 
     $hook = get_plugin_page_hook( $plugin_page, $pagenow );
@@ -1291 +1290 @@
             }
         }
-        if ( !isset($title) || empty ( $title ) ) {
+        if ( empty ( $title ) ) {
             foreach ( $menu as $menu_array ) {
                 if ( isset( $plugin_page ) &&

trunk/wp-admin/install.php

@@ -80 +80 @@
     // 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'] );
 

trunk/wp-admin/link-manager.php

@@ -29 +29 @@
         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;

trunk/wp-admin/menu-header.php

@@ -55 +55 @@
         }
 
-        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 />';

trunk/wp-admin/upload.php

@@ -118 +118 @@
     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;

trunk/wp-content/themes/default/archive.php

@@ -25 +25 @@
       <?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 } ?>

trunk/wp-content/themes/default/sidebar.php

@@ -43 +43 @@
             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>
 

trunk/wp-includes/kses.php

@@ -952 +952 @@
 
     if ( is_array($matches) ) {
-        if ( ! isset($matches[1]) || empty($matches[1]) )
+        if ( empty($matches[1]) )
             return '';
 

trunk/wp-includes/load.php

@@ -63 +63 @@
 
             // 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'];
             }

trunk/wp-includes/post-template.php

@@ -829 +829 @@
 
     // 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');

trunk/wp-includes/post.php

@@ -2079 +2079 @@
     // 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);

trunk/wp-includes/query.php

@@ -2235 +2235 @@
             $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'] = '=';
 

trunk/wp-includes/widgets.php

@@ -967 +967 @@
     $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;