X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-includes/class.wp-styles.php

diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 731ae39c..b1241b30 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -25,6 +25,7 @@ class WP_Styles extends WP_Dependencies {
 	var $concat_version = '';
 	var $do_concat = false;
 	var $print_html = '';
+	var $print_code = '';
 	var $default_dirs;
 
 	function __construct() {
@@ -35,55 +36,93 @@ class WP_Styles extends WP_Dependencies {
 		if ( !parent::do_item($handle) )
 			return false;
 
-		$ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+		$obj = $this->registered[$handle];
+		if ( null === $obj->ver )
+			$ver = '';
+		else
+			$ver = $obj->ver ? $obj->ver : $this->default_version;
+
 		if ( isset($this->args[$handle]) )
-			$ver .= '&' . $this->args[$handle];
+			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
 
 		if ( $this->do_concat ) {
-			if ( $this->in_default_dir($this->registered[$handle]->src) && !isset($this->registered[$handle]->extra['conditional']) && !isset($this->registered[$handle]->extra['alt']) ) {
+			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
 				$this->concat .= "$handle,";
 				$this->concat_version .= "$handle$ver";
+
+				$this->print_code .= $this->print_inline_style( $handle, false );
+
 				return true;
 			}
 		}
 
-		if ( isset($this->registered[$handle]->args) )
-			$media = esc_attr( $this->registered[$handle]->args );
+		if ( isset($obj->args) )
+			$media = esc_attr( $obj->args );
 		else
 			$media = 'all';
 
-		$href = $this->_css_href( $this->registered[$handle]->src, $ver, $handle );
-		$rel = isset($this->registered[$handle]->extra['alt']) && $this->registered[$handle]->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-		$title = isset($this->registered[$handle]->extra['title']) ? "title='" . esc_attr( $this->registered[$handle]->extra['title'] ) . "'" : '';
+		$href = $this->_css_href( $obj->src, $ver, $handle );
+		$rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
+		$title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
 
 		$end_cond = $tag = '';
-		if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) {
-			$tag .= "<!--[if {$this->registered[$handle]->extra['conditional']}]>\n";
+		if ( isset($obj->extra['conditional']) && $obj->extra['conditional'] ) {
+			$tag .= "<!--[if {$obj->extra['conditional']}]>\n";
 			$end_cond = "<![endif]-->\n";
 		}
 
 		$tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle );
-		if ( 'rtl' === $this->text_direction && isset($this->registered[$handle]->extra['rtl']) && $this->registered[$handle]->extra['rtl'] ) {
-			if ( is_bool( $this->registered[$handle]->extra['rtl'] ) )
-				$rtl_href = str_replace( '.css', '-rtl.css', $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" ));
-			else
-				$rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" );
+		if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
+			if ( is_bool( $obj->extra['rtl'] ) ) {
+				$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
+				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
+			} else {
+				$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
+			}
 
 			$tag .= apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle );
 		}
 
 		$tag .= $end_cond;
 
-		if ( $this->do_concat )
+		if ( $this->do_concat ) {
 			$this->print_html .= $tag;
-		else
+			$this->print_html .= $this->print_inline_style( $handle, false );
+		} else {
 			echo $tag;
+			$this->print_inline_style( $handle );
+		}
+
+		return true;
+	}
+
+	function add_inline_style( $handle, $code ) {
+		if ( !$code )
+			return false;
 
-		// Could do something with $this->registered[$handle]->extra here to print out extra CSS rules
-//		echo "<style type='text/css'>\n";
-//		echo "/* <![CDATA[ */\n";
-//		echo "/* ]]> */\n";
-//		echo "</style>\n";
+		$after = $this->get_data( $handle, 'after' );
+		if ( !$after )
+			$after = array();
+
+		$after[] = $code;
+
+		return $this->add_data( $handle, 'after', $after );
+	}
+
+	function print_inline_style( $handle, $echo = true ) {
+		$output = $this->get_data( $handle, 'after' );
+
+		if ( empty( $output ) )
+			return false;
+
+		$output = implode( "\n", $output );
+
+		if ( !$echo )
+			return $output;
+
+		echo "<style type='text/css'>\n";
+		echo "$output\n";
+		echo "</style>\n";
 
 		return true;
 	}
@@ -96,11 +135,12 @@ class WP_Styles extends WP_Dependencies {
 	}
 
 	function _css_href( $src, $ver, $handle ) {
-		if ( !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+		if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
 			$src = $this->base_url . $src;
 		}
 
-		$src = add_query_arg('ver', $ver, $src);
+		if ( !empty($ver) )
+			$src = add_query_arg('ver', $ver, $src);
 		$src = apply_filters( 'style_loader_src', $src, $handle );
 		return esc_url( $src );
 	}
@@ -116,4 +156,15 @@ class WP_Styles extends WP_Dependencies {
 		return false;
 	}
 
+	function do_footer_items() { // HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
+		$this->do_items(false, 1);
+		return $this->done;
+	}
+
+	function reset() {
+		$this->do_concat = false;
+		$this->concat = '';
+		$this->concat_version = '';
+		$this->print_html = '';
+	}
 }