Ticket #2363: objects.diff

wp-includes/functions-post.php

@@ -31 +31 @@
         $post_name       = apply_filters('name_save_pre',      $post_name);
         $comment_status  = apply_filters('comment_status_pre', $comment_status);
         $ping_status     = apply_filters('ping_status_pre',    $ping_status);
+        $post_type       = apply_filters('post_type_pre',      $post_type);
         
         // Make sure we set a valid category
         if (0 == count($post_category) || !is_array($post_category)) {
@@ -101 +102 @@
         if ( !isset($post_password) )
                 $post_password = '';
 
-        if ( ('publish' == $post_status) || ('static' == $post_status) ) {
-                $post_name_check = ('publish' == $post_status)
-                        ? $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'publish' AND ID != '$post_ID' LIMIT 1")
-                        : $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'static' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
+        if ( ('publish' == $post_status) || ('static' == $post_status) || ('object' == $post_status) ) {
+                $parent_check = ( 'static' == $post_status ) ? " AND post_parent = '$post_parent'" : '';
+                $post_name_check = $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = '$post_status' AND ID != '$post_ID'$parent_check LIMIT 1");
 
                 if ($post_name_check) {
                         $suffix = 2;
                         while ($post_name_check) {
                                 $alt_post_name = $post_name . "-$suffix";
-                                $post_name_check = ('publish' == $post_status)
-                                        ? $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = 'publish' AND ID != '$post_ID' LIMIT 1")
-                                        : $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = 'static' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
+                                $post_name_check = $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = '$post_status' AND ID != '$post_ID'$parent_check LIMIT 1");
                                 $suffix++;
                         }
                         $post_name = $alt_post_name;
@@ -139 +137 @@
                         post_modified = '".current_time('mysql')."',
                         post_modified_gmt = '".current_time('mysql',1)."',
                         post_parent = '$post_parent',
-                        menu_order = '$menu_order'
+                        menu_order = '$menu_order',
+                        post_type = '$post_type'
                         WHERE ID = $post_ID");
         } else {
                 $wpdb->query(
                         "INSERT IGNORE INTO $wpdb->posts
-                        (post_author, post_date, post_date_gmt, post_content, post_content_filtered, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping, pinged, post_modified, post_modified_gmt, post_parent, menu_order, post_mime_type)
+                        (post_author, post_date, post_date_gmt, post_content, post_content_filtered, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping, pinged, post_modified, post_modified_gmt, post_parent, menu_order, post_type, post_mime_type)
                         VALUES
-                        ('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_content_filtered', '$post_title', '$post_excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name', '$to_ping', '$pinged', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order', '$post_mime_type')");
+                        ('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_content_filtered', '$post_title', '$post_excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name', '$to_ping', '$pinged', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order', '$post_type', '$post_mime_type')");
                         $post_ID = $wpdb->insert_id;                    
         }
 

wp-includes/classes.php

@@ -32 +32 @@
         var $is_comments_popup = false;
         var $is_admin = false;
         var $is_attachment = false;
+        var $is_dingus = false;
 
         function init_query_flags() {
                 $this->is_single = false;
@@ -52 +53 @@
                 $this->is_paged = false;
                 $this->is_admin = false;
                 $this->is_attachment = false;
+                $this->is_dingus = false;
         }
         
         function init () {
@@ -101 +103 @@
                 if ( ('' != $qv['attachment']) || (int) $qv['attachment_id'] ) {
                         $this->is_single = true;
                         $this->is_attachment = true;
+                } elseif ( ('' != $qv['object']) || (int) $qv['object_id'] ) {
+                        $this->is_single = true;
+                        $this->is_dingus = true;
                 } elseif ('' != $qv['name']) {
                         $this->is_single = true;
                 } elseif ( $qv['p'] ) {
@@ -236 +241 @@
                         $this->is_admin = true;
                 }
 
-                if ( ! ($this->is_attachment || $this->is_archive || $this->is_single || $this->is_page || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup)) {
+                if ( ! ($this->is_dingus || $this->is_attachment || $this->is_archive || $this->is_single || $this->is_page || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup)) {
                         $this->is_home = true;
                 }
 
@@ -392 +397 @@
                         $q['attachment'] = sanitize_title(basename($attach_paths));
                         $q['name'] = $q['attachment'];
                         $where .= " AND post_name = '" . $q['attachment'] . "'";
+                } elseif ('' != $q['object']) {
+                        $q['object'] = sanitize_title($q['object']);
+                        $q['name'] = $q['object'];
+                        $where .= " AND post_name = '" . $q['object'] . "'";
                 }
 
                 if ( (int) $q['w'] ) {
@@ -402 +411 @@
                 if ( intval($q['comments_popup']) )
                         $q['p'] = intval($q['comments_popup']);
 
-                // If a attachment is requested by number, let it supercede any post number.
+                // If a attachment or object is requested by number, let it supercede any post number.
+                if ( ($q['object_id'] != '') && (intval($q['object_id']) != 0) )
+                        $q['p'] = (int) $q['object_id'];
                 if ( ($q['attachment_id'] != '') && (intval($q['attachment_id']) != 0) )
                         $q['p'] = (int) $q['attachment_id'];
 
@@ -594 +605 @@
 
                 if ( $this->is_attachment ) {
                         $where .= ' AND (post_status = "attachment")';
-                } elseif ($this->is_page) {
+                } elseif ( $this->is_dingus ) {
+                        $where .= ' AND (post_status = "object")';
+                } elseif ( $this->is_page ) {
                         $where .= ' AND (post_status = "static")';
-                } elseif ($this->is_single) {
+                } elseif ( $this->is_single ) {
                         $where .= ' AND (post_status != "static")';
                 } else {
                         $where .= ' AND (post_status = "publish"';
@@ -656 +669 @@
                 // Check post status to determine if post should be displayed.
                 if ($this->is_single) {
                         $status = get_post_status($this->posts[0]);
-                        if ( ('publish' != $status) && ('static' != $status) ) {
+                        if ( ('publish' != $status) && ('static' != $status) && ('object' != $status) ) {
                                 if ( ! (isset($user_ID) && ('' != intval($user_ID))) ) {
                                         // User must be logged in to view unpublished posts.
                                         $this->posts = array();