Changeset 13769

Timestamp:

03/19/2010 09:15:00 PM (15 years ago)

Author:

nacin

Message:

Remove unnecessary ternary operators such as (expr) ? true : false.

Location:

trunk

Files:

• wp-admin/import/wordpress.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/install.php (modified) (1 diff)
• wp-app.php (modified) (2 diffs)
• wp-includes/comment-template.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)

trunk/wp-admin/import/wordpress.php

@@ -867 +867 @@
             case 2:
                 check_admin_referer('import-wordpress');
-                $fetch_attachments = (!empty($_POST['attachments'])) ? true : false;
+                $fetch_attachments = ! empty( $_POST['attachments'] );
                 $result = $this->import( $_GET['id'], $fetch_attachments);
                 if ( is_wp_error( $result ) )

trunk/wp-admin/includes/media.php

@@ -1192 +1192 @@
     $display_title = $show_title ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60 ) . "</span></div>" : '';
 
-    $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) ) ? true : false;
+    $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
     $order = '';
 

trunk/wp-admin/includes/plugin.php

@@ -93 +93 @@
         $plugin_data['Network'] = $plugin_data['_sitewide'];
     }
-    $plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) ) ? true : false;
+    $plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) );
     unset( $plugin_data['_sitewide'] );
 

trunk/wp-admin/includes/post.php

@@ -1458 +1458 @@
         $mce_buttons_4 = implode($mce_buttons_4, ',');
     }
-    $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false;
+    $no_captions = (bool) apply_filters( 'disable_captions', '' );
 
     // TinyMCE init settings

trunk/wp-admin/includes/template.php

@@ -2464 +2464 @@
 
     if ( $for_post )
-        $edit = ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) ) ? false : true;
+        $edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
 
     $tab_index_attribute = '';

trunk/wp-admin/includes/upgrade.php

@@ -564 +564 @@
     // MAX(post_date_gmt) can't be '0000-00-00 00:00:00'
     // <michel_v> I just slapped myself silly for not thinking about it earlier
-    $got_gmt_fields = ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00') ? false : true;
+    $got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
 
     if (!$got_gmt_fields) {

trunk/wp-admin/install.php

@@ -76 +76 @@
 function display_setup_form( $error = null ) {
     global $wpdb;
-    $user_table = ( $wpdb->get_var("SHOW TABLES LIKE '$wpdb->users'") != null ) ? true : false;
+    $user_table = ( $wpdb->get_var("SHOW TABLES LIKE '$wpdb->users'") != null );
 
     // Ensure that Blogs appear in search engines by default

trunk/wp-app.php

@@ -413 +413 @@
         }
 
-        $publish = (isset($entry->draft) && trim($entry->draft) == 'yes') ? false : true;
+        $publish = ! ( isset( $entry->draft ) && 'yes' == trim( $entry->draft ) );
 
         $cap = ($publish) ? 'publish_posts' : 'edit_posts';
@@ -506 +506 @@
             $this->auth_required(__('Sorry, you do not have the right to edit this post.'));
 
-        $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true;
+        $publish = ! ( isset($parsed->draft) && 'yes' == trim($parsed->draft) );
         $post_status = ($publish) ? 'publish' : 'draft';
 

trunk/wp-includes/comment-template.php

@@ -1419 +1419 @@
             $r['page'] = get_query_var('cpage');
         } else {
-            $threaded = ( -1 == $r['max_depth'] ) ? false : true;
+            $threaded = ( -1 != $r['max_depth'] );
             $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
             set_query_var( 'cpage', $r['page'] );
@@ -1430 +1430 @@
 
     if ( null === $r['reverse_top_level'] )
-        $r['reverse_top_level'] = ( 'desc' == get_option('comment_order') ) ? TRUE : FALSE;
+        $r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
 
     extract( $r, EXTR_SKIP );

trunk/wp-includes/functions.php

@@ -3830 +3830 @@
         // This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
         $exists = array(
-            0 => ( isset( $zone[0] ) && $zone[0] ) ? true : false,
-            1 => ( isset( $zone[1] ) && $zone[1] ) ? true : false,
-            2 => ( isset( $zone[2] ) && $zone[2] ) ? true : false
+            0 => ( isset( $zone[0] ) && $zone[0] ),
+            1 => ( isset( $zone[1] ) && $zone[1] ),
+            2 => ( isset( $zone[2] ) && $zone[2] ),
         );
-        $exists[3] = ( $exists[0] && 'Etc' !== $zone[0] ) ? true : false;
-        $exists[4] = ( $exists[1] && $exists[3] ) ? true : false;
-        $exists[5] = ( $exists[2] && $exists[3] ) ? true : false;
+        $exists[3] = ( $exists[0] && 'Etc' !== $zone[0] );
+        $exists[4] = ( $exists[1] && $exists[3] );
+        $exists[5] = ( $exists[2] && $exists[3] );
 
         $zonen[] = array(

trunk/wp-includes/media.php

@@ -1117 +1117 @@
 
             // Use oEmbed to get the HTML
-            $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
+            $attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) );
             $html = wp_oembed_get( $url, $attr );
 

trunk/wp-includes/pluggable.php

@@ -685 +685 @@
 
     if ( '' === $secure )
-        $secure = is_ssl() ? true : false;
+        $secure = is_ssl();
 
     if ( $secure ) {
@@ -778 +778 @@
     // Checks if a user is logged in, if not redirects them to the login page
 
-    if ( is_ssl() || force_ssl_admin() )
-        $secure = true;
-    else
-        $secure = false;
+    $secure = ( is_ssl() || force_ssl_admin() );
 
     // If https is required and request is http, redirect

trunk/wp-includes/rewrite.php

@@ -1959 +1959 @@
         unset($this->feed_structure);
         unset($this->comment_feed_structure);
-        $this->use_trailing_slashes = ( substr($this->permalink_structure, -1, 1) == '/' ) ? true : false;
+        $this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
 
         // Enable generic rules for pages if permalink structure doesn't begin with a wildcard.

trunk/wp-includes/user.php

@@ -42 +42 @@
 
     if ( '' === $secure_cookie )
-        $secure_cookie = is_ssl() ? true : false;
+        $secure_cookie = is_ssl();
 
     global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie