Changes from branches/2.7/wp-includes/post.php at r10253 to trunk/wp-includes/post.php at r10150

File:

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

trunk/wp-includes/post.php

@@ -216 +216 @@
         else
             return $null;
-    } elseif ( is_object($post) && empty($post->filter) ) {
+    } elseif ( is_object($post) ) {
         _get_post_ancestors($post);
         wp_cache_add($post->ID, $post, 'posts');
         $_post = &$post;
     } else {
-        if ( is_object($post) )
-            $post = $post->ID;
         $post = (int) $post;
         if ( ! $_post = wp_cache_get($post, 'posts') ) {
@@ -742 +740 @@
     $custom = get_post_custom($post_id);
 
-    return isset($custom[$key]) ? $custom[$key] : null;
+    return $custom[$key];
 }
 
@@ -795 +793 @@
         foreach ( array_keys(get_object_vars($post)) as $field )
             $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
-        $post->filter = $context;
     } else {
         if ( !isset($post['ID']) )
@@ -801 +798 @@
         foreach ( array_keys($post) as $field )
             $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
-        $post['filter'] = $context;
-    }
-
+    }
     return $post;
 }
@@ -2541 +2536 @@
             if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
                 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
-            elseif ( false !== strpos($file, 'wp-content/uploads') )
-                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
-            else
-                $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
         }
     }