WordPress 3.9

[autoinstalls/wordpress.git] / wp-includes / class-wp-theme.php

diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index 511699adce66159a75fc46c809a4225cbc0b5ba2..6af098fe3b749e7e7658c6b650b78d29babb096a 100644 (file)
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -179,6 +179,7 @@ final class WP_Theme implements ArrayAccess {
 
                // Initialize caching on first run.
                if ( ! isset( self::$persistently_cache ) ) {
+                       /** This action is documented in wp-includes/theme.php */
                        self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
                        if ( self::$persistently_cache ) {
                                wp_cache_add_global_groups( 'themes' );
@@ -534,7 +535,7 @@ final class WP_Theme implements ArrayAccess {
         * @since 3.4.0
         *
         * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
-        * @return string String on success, false on failure.
+        * @return string|bool String on success, false on failure.
         */
        public function get( $header ) {
                if ( ! isset( $this->headers[ $header ] ) )
@@ -570,10 +571,13 @@ final class WP_Theme implements ArrayAccess {
         * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
         * @param bool $markup Optional. Whether to mark up the header. Defaults to true.
         * @param bool $translate Optional. Whether to translate the header. Defaults to true.
-        * @return string Processed header, false on failure.
+        * @return string|bool Processed header, false on failure.
         */
        public function display( $header, $markup = true, $translate = true ) {
                $value = $this->get( $header );
+               if ( false === $value ) {
+                       return false;
+               }
 
                if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
                        $translate = false;
@@ -930,9 +934,10 @@ final class WP_Theme implements ArrayAccess {
         * @since 3.4.0
         * @access public
         *
+        * @param WP_Post|null $post Optional. The post being edited, provided for context.
         * @return array Array of page templates, keyed by filename, with the value of the translated header name.
         */
-       public function get_page_templates() {
+       public function get_page_templates( $post = null ) {
                // If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
                if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
                        return array();
@@ -960,9 +965,23 @@ final class WP_Theme implements ArrayAccess {
                }
 
                if ( $this->parent() )
-                       $page_templates += $this->parent()->get_page_templates();
-
-               return $page_templates;
+                       $page_templates += $this->parent()->get_page_templates( $post );
+
+               /**
+                * Filter list of page templates for a theme.
+                *
+                * This filter does not currently allow for page templates to be added.
+                *
+                * @since 3.9.0
+                *
+                * @param array        $page_templates Array of page templates. Keys are filenames,
+                *                                     values are translated names.
+                * @param WP_Theme     $this           The theme object.
+                * @param WP_Post|null $post           The post being edited, provided for context, or null.
+                */
+               $return = apply_filters( 'theme_page_templates', $page_templates, $this, $post );
+
+               return array_intersect_assoc( $return, $page_templates );
        }
 
        /**
@@ -1086,6 +1105,13 @@ final class WP_Theme implements ArrayAccess {
         * @return array Array of stylesheet names.
         */
        public static function get_allowed( $blog_id = null ) {
+               /**
+                * Filter the array of themes allowed on the site or network.
+                *
+                * @since MU
+                *
+                * @param array $allowed_themes An array of theme stylesheet names.
+                */
                $network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
                return $network + self::get_allowed_on_site( $blog_id );
        }