X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..11be15bd505d66a91e2c80062190b13e315a04a9:/wp-includes/class.wp-styles.php
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 3caf6397..b1241b30 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -18,8 +18,15 @@
*/
class WP_Styles extends WP_Dependencies {
var $base_url;
+ var $content_url;
var $default_version;
var $text_direction = 'ltr';
+ var $concat = '';
+ var $concat_version = '';
+ var $do_concat = false;
+ var $print_html = '';
+ var $print_code = '';
+ var $default_dirs;
function __construct() {
do_action_ref_array( 'wp_default_styles', array(&$this) );
@@ -29,45 +36,98 @@ 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($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 );
- if ( isset($this->registered[$handle]->args) )
- $media = attribute_escape( $this->registered[$handle]->args );
+ return true;
+ }
+ }
+
+ if ( isset($obj->args) )
+ $media = esc_attr( $obj->args );
else
$media = 'all';
- $href = $this->_css_href( $this->registered[$handle]->src, $ver, $handle );
+ $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 = '';
- if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) {
- echo "\n";
}
- echo apply_filters( 'style_loader_tag', "\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', $href );
- else
- $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" );
+ $tag .= apply_filters( 'style_loader_tag', "\n", $handle );
+ 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" );
+ }
- echo apply_filters( 'style_loader_tag', "\n", $handle );
+ $tag .= apply_filters( 'style_loader_tag', "\n", $handle );
}
- echo $end_cond;
+ $tag .= $end_cond;
- // Could do something with $this->registered[$handle]->extra here to print out extra CSS rules
-// echo "\n";
+ if ( $this->do_concat ) {
+ $this->print_html .= $tag;
+ $this->print_html .= $this->print_inline_style( $handle, false );
+ } else {
+ echo $tag;
+ $this->print_inline_style( $handle );
+ }
return true;
}
- function all_deps( $handles, $recursion = false ) {
+ function add_inline_style( $handle, $code ) {
+ if ( !$code )
+ return false;
+
+ $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 "\n";
+
+ return true;
+ }
+
+ function all_deps( $handles, $recursion = false, $group = false ) {
$r = parent::all_deps( $handles, $recursion );
if ( !$recursion )
$this->to_do = apply_filters( 'print_styles_array', $this->to_do );
@@ -75,13 +135,36 @@ class WP_Styles extends WP_Dependencies {
}
function _css_href( $src, $ver, $handle ) {
- if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) {
+ 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 clean_url( $src );
+ return esc_url( $src );
}
+ function in_default_dir($src) {
+ if ( ! $this->default_dirs )
+ return true;
+
+ foreach ( (array) $this->default_dirs as $test ) {
+ if ( 0 === strpos($src, $test) )
+ return true;
+ }
+ 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 = '';
+ }
}