Changeset 24249

Timestamp:

05/14/2013 01:57:59 PM (13 years ago)

Author:

ryan

Message:

Remove redundant post ID validation.

Props SergeyBiryukov
fixes #24199

Location:

trunk/wp-includes

Files:

• media.php (modified) (4 diffs)
• post-formats.php (modified) (3 diffs)

trunk/wp-includes/media.php

@@ -1851 +1851 @@
  */
 function get_attached_media( $type, $post_id = 0 ) {
-    $post = empty( $post_id ) ? get_post() : get_post( $post_id );
-    if ( empty( $post ) )
+    if ( ! $post = get_post( $post_id ) )
         return;
 
@@ -2341 +2340 @@
  */
 function get_post_galleries( $post_id = 0, $html = true ) {
-    $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
-    if ( empty( $post ) || ! has_shortcode( $post->post_content, 'gallery' )  )
+    if ( ! $post = get_post( $post_id ) )
+        return array();
+
+    if ( ! has_shortcode( $post->post_content, 'gallery' )  )
         return array();
 
@@ -2358 +2359 @@
  */
 function get_post_galleries_images( $post_id = 0 ) {
-    $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
-    if ( empty( $post ) || ! has_shortcode( $post->post_content, 'gallery' )  )
+    if ( ! $post = get_post( $post_id ) )
+        return array();
+
+    if ( ! has_shortcode( $post->post_content, 'gallery' )  )
         return array();
 
@@ -2376 +2379 @@
  */
 function get_post_gallery( $post_id = 0, $html = true ) {
-    $post = empty( $post_id ) ? clone get_post() : get_post( $post_id );
-    if ( empty( $post ) || ! has_shortcode( $post->post_content, 'gallery' ) )
+    if ( ! $post = get_post( $post_id ) )
+        return array();
+
+    if ( ! has_shortcode( $post->post_content, 'gallery' ) )
         return array();
 

trunk/wp-includes/post-formats.php

@@ -317 +317 @@
  *
  * @param string $content The post content.
- * @param int $id (optional) The post ID.
+ * @param int $post_id (optional) The post ID.
  * @return string Formatted output based on associated post format.
  */
-function post_formats_compat( $content, $id = 0 ) {
-    $post = empty( $id ) ? get_post() : get_post( $id );
-    if ( empty( $post ) )
+function post_formats_compat( $content, $post_id = 0 ) {
+    if ( ! $post = get_post( $post_id ) )
         return $content;
 
@@ -640 +639 @@
  * @since 3.6.0
  *
- * @param int $id (optional) The post ID.
+ * @param int $post_id (optional) The post ID.
  * @return array The chat content.
  */
-function get_the_post_format_chat( $id = 0 ) {
-    $post = empty( $id ) ? clone get_post() : get_post( $id );
-    if ( empty( $post ) )
+function get_the_post_format_chat( $post_id = 0 ) {
+    if ( ! $post = get_post( $post_id ) )
         return array();
 
@@ -815 +813 @@
  * @since 3.6.0
  *
- * @param int $id (optional) The post ID.
+ * @param int $post_id (optional) The post ID.
  * @return string A URL, if found.
  */
-function get_the_post_format_url( $id = 0 ) {
-    $post = empty( $id ) ? get_post() : get_post( $id );
-    if ( empty( $post ) )
+function get_the_post_format_url( $post_id = 0 ) {
+    if ( ! $post = get_post( $post_id ) )
         return '';