X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..4feeb71a9d812a9ae371c28a3d8b442a4394ded7:/wp-includes/class.wp-styles.php
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 6455fe47..a175058b 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -1,38 +1,144 @@
concat .= "$handle,";
$this->concat_version .= "$handle$ver";
- $this->print_code .= $this->get_data( $handle, 'after' );
+ $this->print_code .= $this->print_inline_style( $handle, false );
return true;
}
@@ -61,91 +167,204 @@ class WP_Styles extends WP_Dependencies {
else
$media = 'all';
+ // A single item may alias a set of items, by having dependencies, but no source.
+ if ( ! $obj->src ) {
+ if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
+ $inline_style = sprintf( "\n", esc_attr( $handle ), $inline_style );
+ if ( $this->do_concat ) {
+ $this->print_html .= $inline_style;
+ } else {
+ echo $inline_style;
+ }
+ }
+ return true;
+ }
+
$href = $this->_css_href( $obj->src, $ver, $handle );
+ if ( ! $href ) {
+ return true;
+ }
+
$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($obj->extra['conditional']) && $obj->extra['conditional'] ) {
- $tag .= "\n";
- }
-
- $tag .= apply_filters( 'style_loader_tag', "\n", $handle );
+ /**
+ * Filter the HTML link tag of an enqueued style.
+ *
+ * @since 2.6.0
+ * @since 4.3.0 Introduced the `$href` parameter.
+ * @since 4.5.0 Introduced the `$media` parameter.
+ *
+ * @param string $html The link tag for the enqueued style.
+ * @param string $handle The style's registered handle.
+ * @param string $href The stylesheet's source URL.
+ * @param string $media The stylesheet's media attribute.
+ */
+ $tag = apply_filters( 'style_loader_tag', "\n", $handle, $href, $media);
if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
- if ( is_bool( $obj->extra['rtl'] ) ) {
+ if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $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', "\n", $handle );
+ /** This filter is documented in wp-includes/class.wp-styles.php */
+ $rtl_tag = apply_filters( 'style_loader_tag', "\n", $handle, $rtl_href, $media );
+
+ if ( $obj->extra['rtl'] === 'replace' ) {
+ $tag = $rtl_tag;
+ } else {
+ $tag .= $rtl_tag;
+ }
}
- $tag .= $end_cond;
+ $conditional_pre = $conditional_post = '';
+ if ( isset( $obj->extra['conditional'] ) && $obj->extra['conditional'] ) {
+ $conditional_pre = "\n";
+ }
if ( $this->do_concat ) {
+ $this->print_html .= $conditional_pre;
$this->print_html .= $tag;
- $this->print_html .= $this->print_inline_style( $handle, false );
+ if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
+ $this->print_html .= sprintf( "\n", esc_attr( $handle ), $inline_style );
+ }
+ $this->print_html .= $conditional_post;
} else {
+ echo $conditional_pre;
echo $tag;
$this->print_inline_style( $handle );
+ echo $conditional_post;
}
return true;
}
- function add_inline_style( $handle, $code ) {
- if ( !$code )
+ /**
+ * Adds extra CSS styles to a registered stylesheet.
+ *
+ * @since 3.3.0
+ * @access public
+ *
+ * @param string $handle The style's registered handle.
+ * @param string $code String containing the CSS styles to be added.
+ * @return bool True on success, false on failure.
+ */
+ public function add_inline_style( $handle, $code ) {
+ if ( ! $code ) {
return false;
+ }
$after = $this->get_data( $handle, 'after' );
- if ( !$after )
+ if ( ! $after ) {
$after = array();
+ }
$after[] = $code;
return $this->add_data( $handle, 'after', $after );
}
- function print_inline_style( $handle, $echo = true ) {
+ /**
+ * Prints extra CSS styles of a registered stylesheet.
+ *
+ * @since 3.3.0
+ * @access public
+ *
+ * @param string $handle The style's registered handle.
+ * @param bool $echo Optional. Whether to echo the inline style instead of just returning it.
+ * Default true.
+ * @return string|bool False if no data exists, inline styles if `$echo` is true, true otherwise.
+ */
+ public function print_inline_style( $handle, $echo = true ) {
$output = $this->get_data( $handle, 'after' );
- if ( empty( $output ) )
+ if ( empty( $output ) ) {
return false;
+ }
$output = implode( "\n", $output );
- if ( !$echo )
+ if ( ! $echo ) {
return $output;
+ }
- echo "\n";
+ printf( "\n", esc_attr( $handle ), $output );
return true;
}
- function all_deps( $handles, $recursion = false, $group = false ) {
- $r = parent::all_deps( $handles, $recursion );
- if ( !$recursion )
+ /**
+ * Determines style dependencies.
+ *
+ * @since 2.6.0
+ * @access public
+ *
+ * @see WP_Dependencies::all_deps()
+ *
+ * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+ * @param bool $recursion Internal flag that function is calling itself.
+ * @param int|false $group Group level: (int) level, (false) no groups.
+ * @return bool True on success, false on failure.
+ */
+ public function all_deps( $handles, $recursion = false, $group = false ) {
+ $r = parent::all_deps( $handles, $recursion, $group );
+ if ( ! $recursion ) {
+ /**
+ * Filter the array of enqueued styles before processing for output.
+ *
+ * @since 2.6.0
+ *
+ * @param array $to_do The list of enqueued styles about to be processed.
+ */
$this->to_do = apply_filters( 'print_styles_array', $this->to_do );
+ }
return $r;
}
- function _css_href( $src, $ver, $handle ) {
- if ( !is_bool($src) && !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+ /**
+ * Generates an enqueued style's fully-qualified URL.
+ *
+ * @since 2.6.0
+ * @access public
+ *
+ * @param string $src The source of the enqueued style.
+ * @param string $ver The version of the enqueued style.
+ * @param string $handle The style's registered handle.
+ * @return string Style's fully-qualified URL.
+ */
+ public function _css_href( $src, $ver, $handle ) {
+ if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
$src = $this->base_url . $src;
}
if ( !empty($ver) )
$src = add_query_arg('ver', $ver, $src);
+
+ /**
+ * Filter an enqueued style's fully-qualified URL.
+ *
+ * @since 2.6.0
+ *
+ * @param string $src The source URL of the enqueued style.
+ * @param string $handle The style's registered handle.
+ */
$src = apply_filters( 'style_loader_src', $src, $handle );
return esc_url( $src );
}
- function in_default_dir($src) {
+ /**
+ * Whether a handle's source is in a default directory.
+ *
+ * @since 2.8.0
+ * @access public
+ *
+ * @param string $src The source of the enqueued style.
+ * @return bool True if found, false if not.
+ */
+ public function in_default_dir( $src ) {
if ( ! $this->default_dirs )
return true;
@@ -156,16 +375,33 @@ 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.
+ /**
+ * Processes items and dependencies for the footer group.
+ *
+ * HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
+ *
+ * @since 3.3.0
+ * @access public
+ *
+ * @see WP_Dependencies::do_items()
+ *
+ * @return array Handles of items that have been processed.
+ */
+ public function do_footer_items() {
$this->do_items(false, 1);
return $this->done;
}
- function reset() {
+ /**
+ * Resets class properties.
+ *
+ * @since 3.3.0
+ * @access public
+ */
+ public function reset() {
$this->do_concat = false;
$this->concat = '';
$this->concat_version = '';
$this->print_html = '';
}
}
-