WordPress 4.0

[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 cd4ef4ee086bfe74873ed9dc0d580c4f04851c76..eaf244b78e7d5b3989cee0023b3b7311854e1560 100644 (file)
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -43,6 +43,15 @@ final class WP_Theme implements ArrayAccess {
                'twentyeleven'   => 'Twenty Eleven',
                'twentytwelve'   => 'Twenty Twelve',
                'twentythirteen' => 'Twenty Thirteen',
                'twentyeleven'   => 'Twenty Eleven',
                'twentytwelve'   => 'Twenty Twelve',
                'twentythirteen' => 'Twenty Thirteen',

+               'twentyfourteen' => 'Twenty Fourteen',
+       );
+
+       /**
+        * Renamed theme tags.
+        */
+       private static $tag_map = array(
+               'fixed-width'    => 'fixed-layout',
+               'flexible-width' => 'fluid-layout',

        );
 
        /**
        );
 
        /**


@@ -170,6 +179,7 @@ final class WP_Theme implements ArrayAccess {
 
                // Initialize caching on first run.
                if ( ! isset( self::$persistently_cache ) ) {
 
                // 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' );
                        self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
                        if ( self::$persistently_cache ) {
                                wp_cache_add_global_groups( 'themes' );


@@ -525,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.
         * @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 ] ) )
         */
        public function get( $header ) {
                if ( ! isset( $this->headers[ $header ] ) )


@@ -561,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.
         * @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 );
         */
        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;
 
                if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
                        $translate = false;


@@ -649,10 +662,7 @@ final class WP_Theme implements ArrayAccess {
                                break;
                        case 'Author' :
                                if ( $this->get('AuthorURI') ) {
                                break;
                        case 'Author' :
                                if ( $this->get('AuthorURI') ) {

-                                       static $attr = null;
-                                       if ( ! isset( $attr ) )
-                                               $attr = esc_attr__( 'Visit author homepage' );
-                                       $value = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $this->display( 'AuthorURI', true, $translate ), $attr, $value );
+                                       $value = sprintf( '<a href="%1$s">%2$s</a>', $this->display( 'AuthorURI', true, $translate ), $value );

                                } elseif ( ! $value ) {
                                        $value = __( 'Anonymous' );
                                }
                                } elseif ( ! $value ) {
                                        $value = __( 'Anonymous' );
                                }


@@ -705,12 +715,15 @@ final class WP_Theme implements ArrayAccess {
                                }
 
                                foreach ( $value as &$tag ) {
                                }
 
                                foreach ( $value as &$tag ) {

-                                       if ( isset( $tags_list[ $tag ] ) )
+                                       if ( isset( $tags_list[ $tag ] ) ) {

                                                $tag = $tags_list[ $tag ];
                                                $tag = $tags_list[ $tag ];

+                                       } elseif ( isset( self::$tag_map[ $tag ] ) ) {
+                                               $tag = $tags_list[ self::$tag_map[ $tag ] ];
+                                       }

                                }
 
                                return $value;
                                }
 
                                return $value;

-                               break;
+

                        default :
                                $value = translate( $value, $this->get('TextDomain') );
                }
                        default :
                                $value = translate( $value, $this->get('TextDomain') );
                }


@@ -918,9 +931,10 @@ final class WP_Theme implements ArrayAccess {
         * @since 3.4.0
         * @access public
         *
         * @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.
         */
         * @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();
                // 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();


@@ -948,9 +962,23 @@ final class WP_Theme implements ArrayAccess {
                }
 
                if ( $this->parent() )
                }
 
                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 );

        }
 
        /**
        }
 
        /**


@@ -1074,6 +1102,13 @@ final class WP_Theme implements ArrayAccess {
         * @return array Array of stylesheet names.
         */
        public static function get_allowed( $blog_id = null ) {
         * @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 );
        }
                $network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() );
                return $network + self::get_allowed_on_site( $blog_id );
        }