Changeset 12134

Timestamp:

11/01/2009 10:10:06 AM (15 years ago)

Author:

westi

Message:

Introduce require_if_theme_supports(), move post thumbnails functions to there own include and only included them if the theme supports them. See #10928 and [12132]

Location:

trunk

Files:

• wp-includes/post-image-template.php (added)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/post-template.php

@@ -882 +882 @@
 
 //
-// Post images
-//
-
-function has_post_image( $post_id = NULL ) {
-    global $id;
-    $post_id = ( NULL === $post_id ) ? $id : $post_id;
-    return !! get_post_image_id( $post_id );
-}
-
-function get_post_image_id( $post_id = NULL ) {
-    global $id;
-    $post_id = ( NULL === $post_id ) ? $id : $post_id;
-    return get_post_meta( $post_id, '_thumbnail_id', true );
-}
-
-function the_post_image( $size = 'thumbnail', $attr = '' ) {
-    echo get_the_post_image( NULL, $size, $attr );
-}
-
-function get_the_post_image( $post_id = NULL, $size = 'thumbnail', $attr = '' ) {
-    global $id;
-    $post_id = ( NULL === $post_id ) ? $id : $post_id;
-    $post_image_id = get_post_image_id( $post_id );
-    $size = apply_filters( 'post_image_size', $size );
-    if ( $post_image_id ) {
-        do_action( 'begin_fetch_post_image_html', $post_id, $post_image_id, $size ); // for "Just In Time" filtering of all of wp_get_attachment_image()'s filters
-        $html = wp_get_attachment_image( $post_image_id, $size, false, $attr );
-        do_action( 'end_fetch_post_image_html', $post_id, $post_image_id, $size );
-    } else {
-        $html = '';
-    }
-    return apply_filters( 'post_image_html', $html, $post_id, $post_image_id );
-}
-
-//
 // Attachments
 //

trunk/wp-includes/theme.php

@@ -1306 +1306 @@
 /**
  * Allows a theme to register its support of a certain feature
+ * 
+ * Must be called in the themes functions.php file to work.
  *
  * @author Mark Jaquith
@@ -1330 +1332 @@
 }
 
+/**
+ * Checks a theme's support for a given feature before loading the functions which implement it.
+ *
+ * @author Peter Westwood
+ * @since 2.9
+ * @param string $feature the feature being checked
+ * @param string $include the file containing the functions that implement the feature
+ */
+function require_if_theme_supports( $feature, $include) {
+    if ( current_theme_supports( $feature ) )
+        require ( $include );
+}
+
 ?>

trunk/wp-settings.php

@@ -688 +688 @@
     include(TEMPLATEPATH . '/functions.php');
 
+// Load in support for template functions which the theme supports
+require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-image-template.php' );
+
 /**
  * Runs just before PHP shuts down execution.