--- a/wp/wp-includes/class-wp-theme.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/class-wp-theme.php Tue Jun 09 03:35:32 2015 +0200
@@ -43,6 +43,16 @@
'twentyeleven' => 'Twenty Eleven',
'twentytwelve' => 'Twenty Twelve',
'twentythirteen' => 'Twenty Thirteen',
+ 'twentyfourteen' => 'Twenty Fourteen',
+ 'twentyfifteen' => 'Twenty Fifteen',
+ );
+
+ /**
+ * Renamed theme tags.
+ */
+ private static $tag_map = array(
+ 'fixed-width' => 'fixed-layout',
+ 'flexible-width' => 'fluid-layout',
);
/**
@@ -170,6 +180,7 @@
// 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' );
@@ -263,7 +274,7 @@
// Set the parent, if we're a child theme.
if ( $this->template != $this->stylesheet ) {
// If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
- if ( is_a( $_child, 'WP_Theme' ) && $_child->template == $this->stylesheet ) {
+ if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
$_child->parent = null;
$_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), $_child->template ) );
$_child->cache_add( 'theme', array( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
@@ -525,7 +536,7 @@
* @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 ] ) )
@@ -561,10 +572,13 @@
* @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;
@@ -622,6 +636,9 @@
case 'Tags' :
$value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
break;
+ case 'Version' :
+ $value = strip_tags( $value );
+ break;
}
return $value;
@@ -649,10 +666,7 @@
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' );
}
@@ -705,12 +719,15 @@
}
foreach ( $value as &$tag ) {
- if ( isset( $tags_list[ $tag ] ) )
+ if ( isset( $tags_list[ $tag ] ) ) {
$tag = $tags_list[ $tag ];
+ } elseif ( isset( self::$tag_map[ $tag ] ) ) {
+ $tag = $tags_list[ self::$tag_map[ $tag ] ];
+ }
}
return $value;
- break;
+
default :
$value = translate( $value, $this->get('TextDomain') );
}
@@ -841,8 +858,6 @@
* for all other URLs returned by WP_Theme, so we pass it to the public function
* get_theme_root_uri() and allow it to run the theme_root_uri filter.
*
- * @uses get_theme_root_uri()
- *
* @since 3.4.0
* @access public
*
@@ -918,9 +933,10 @@
* @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();
@@ -948,9 +964,23 @@
}
if ( $this->parent() )
- $page_templates += $this->parent()->get_page_templates();
+ $page_templates += $this->parent()->get_page_templates( $post );
- return $page_templates;
+ /**
+ * 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 );
}
/**
@@ -1006,8 +1036,8 @@
* @since 3.4.0
* @access public
*
- * @return True if the textdomain was successfully loaded or has already been loaded. False if
- * no textdomain was specified in the file headers, or if the domain could not be loaded.
+ * @return bool True if the textdomain was successfully loaded or has already been loaded.
+ * False if no textdomain was specified in the file headers, or if the domain could not be loaded.
*/
public function load_textdomain() {
if ( isset( $this->textdomain_loaded ) )
@@ -1074,6 +1104,13 @@
* @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 );
}