Changeset 4495 for trunk/wp-includes/post.php

Timestamp:

11/19/2006 07:56:05 AM (19 years ago)

Author:

ryan

Message:

Remove trailing spaces and convert spaces to tabs. Props Nazgul. fixes #986

File:

• trunk/wp-includes/post.php (modified) (15 diffs)

trunk/wp-includes/post.php

@@ -167 +167 @@
     if ( !empty($include) ) {
         $offset = 0;    //ignore offset, category, exclude, meta_key, and meta_value params if using include
-        $category = ''; 
-        $exclude = '';  
+        $category = '';
+        $exclude = '';
         $meta_key = '';
         $meta_value = '';
@@ -182 +182 @@
         }
     }
-    if (!empty($inclusions)) 
-        $inclusions .= ')'; 
+    if (!empty($inclusions))
+        $inclusions .= ')';
 
     $exclusions = '';
@@ -197 +197 @@
         }
     }
-    if (!empty($exclusions)) 
+    if (!empty($exclusions))
         $exclusions .= ')';
 
     $query ="SELECT DISTINCT * FROM $wpdb->posts " ;
-    $query .= ( empty( $category ) ? "" : ", $wpdb->post2cat " ) ; 
-    $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ) ; 
+    $query .= ( empty( $category ) ? "" : ", $wpdb->post2cat " ) ;
+    $query .= ( empty( $meta_key ) ? "" : ", $wpdb->postmeta " ) ;
     $query .= " WHERE (post_type = 'post' AND post_status = 'publish') $exclusions $inclusions " ;
     $query .= ( empty( $category ) ? "" : "AND ($wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $category. ") " ) ;
@@ -401 +401 @@
     $post_ID = (int) $post_ID;
 
-    $sql = "SELECT category_id 
-        FROM $wpdb->post2cat 
-        WHERE post_id = '$post_ID' 
+    $sql = "SELECT category_id
+        FROM $wpdb->post2cat
+        WHERE post_id = '$post_ID'
         ORDER BY category_id";
 
@@ -436 +436 @@
     if($mode == OBJECT) {
         $post->post_category = wp_get_post_categories($postid);
-    } 
+    }
     else {
         $post['post_category'] = wp_get_post_categories($postid);
@@ -636 +636 @@
             if ( $post_pingback )
                 $result = $wpdb->query("
-                    INSERT INTO $wpdb->postmeta 
-                    (post_id,meta_key,meta_value) 
+                    INSERT INTO $wpdb->postmeta
+                    (post_id,meta_key,meta_value)
                     VALUES ('$post_ID','_pingme','1')
                 ");
             $result = $wpdb->query("
-                INSERT INTO $wpdb->postmeta 
-                (post_id,meta_key,meta_value) 
+                INSERT INTO $wpdb->postmeta
+                (post_id,meta_key,meta_value)
                 VALUES ('$post_ID','_encloseme','1')
             ");
@@ -654 +654 @@
             if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template))
                 add_post_meta($post_ID, '_wp_page_template',  $page_template, true);
-                
+
         if ( $post_status == 'publish' )
             do_action('publish_page', $post_ID);
@@ -685 +685 @@
 
     // Passed post category list overwrites existing category list if not empty.
-    if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
+    if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
              && 0 != count($postarr['post_category']) )
-        $post_cats = $postarr['post_category'];
-    else 
-        $post_cats = $post['post_category'];
+        $post_cats = $postarr['post_category'];
+    else
+        $post_cats = $post['post_category'];
 
     // Drafts shouldn't be assigned a date unless explicitly done so by the user
-    if ( 'draft' == $post['post_status'] && empty($postarr['edit_date']) && empty($postarr['post_date']) && 
-         ('0000-00-00 00:00:00' == $post['post_date']) )
+    if ( 'draft' == $post['post_status'] && empty($postarr['edit_date']) && empty($postarr['post_date']) &&
+             ('0000-00-00 00:00:00' == $post['post_date']) )
         $clear_date = true;
     else
         $clear_date = false;
 
-    // Merge old and new fields with new fields overwriting old ones.
-    $postarr = array_merge($post, $postarr);
-    $postarr['post_category'] = $post_cats;
+    // Merge old and new fields with new fields overwriting old ones.
+    $postarr = array_merge($post, $postarr);
+    $postarr['post_category'] = $post_cats;
     if ( $clear_date ) {
         $postarr['post_date'] = '';
@@ -734 +734 @@
     // First the old categories
     $old_categories = $wpdb->get_col("
-        SELECT category_id 
-        FROM $wpdb->post2cat 
+        SELECT category_id
+        FROM $wpdb->post2cat
         WHERE post_id = $post_ID");
 
@@ -750 +750 @@
         foreach ($delete_cats as $del) {
             $wpdb->query("
-                DELETE FROM $wpdb->post2cat 
-                WHERE category_id = $del 
-                    AND post_id = $post_ID 
+                DELETE FROM $wpdb->post2cat
+                WHERE category_id = $del
+                    AND post_id = $post_ID
                 ");
         }
@@ -849 +849 @@
         $trackback_urls = explode(',', $tb_list);
         foreach($trackback_urls as $tb_url) {
-            $tb_url = trim($tb_url);
-            trackback($tb_url, stripslashes($post_title), $excerpt, $post_id);
-        }
-    }
+                $tb_url = trim($tb_url);
+                trackback($tb_url, stripslashes($post_title), $excerpt, $post_id);
+        }
+        }
 }
 
@@ -929 +929 @@
     $pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = '$leaf_path' AND post_type='page'");
 
-    if ( empty($pages) ) 
+    if ( empty($pages) )
         return NULL;
 
@@ -1019 +1019 @@
     $inclusions = '';
     if ( !empty($include) ) {
-        $child_of = 0; //ignore child_of, exclude, meta_key, and meta_value params if using include 
-        $exclude = '';  
+        $child_of = 0; //ignore child_of, exclude, meta_key, and meta_value params if using include
+        $exclude = '';
         $meta_key = '';
         $meta_value = '';
@@ -1033 +1033 @@
         }
     }
-    if (!empty($inclusions)) 
-        $inclusions .= ')'; 
+    if (!empty($inclusions))
+        $inclusions .= ')';
 
     $exclusions = '';
@@ -1197 +1197 @@
     if (empty($post_date))
         $post_date = current_time('mysql');
-    if (empty($post_date_gmt)) 
+    if (empty($post_date_gmt))
         $post_date_gmt = current_time('mysql', 1);