diff -r a4642baaf829 -r 4d4862461b8d web/wp-includes/class.wp-styles.php --- a/web/wp-includes/class.wp-styles.php Tue Feb 02 14:45:47 2010 +0000 +++ b/web/wp-includes/class.wp-styles.php Tue Feb 02 15:44:16 2010 +0000 @@ -1,119 +1,119 @@ -registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version; - if ( isset($this->args[$handle]) ) - $ver .= '&' . $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']) ) { - $this->concat .= "$handle,"; - $this->concat_version .= "$handle$ver"; - return true; - } - } - - if ( isset($this->registered[$handle]->args) ) - $media = esc_attr( $this->registered[$handle]->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'] ) . "'" : ''; - - $end_cond = $tag = ''; - if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) { - $tag .= "\n"; - } - - $tag .= 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', $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" )); - else - $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" ); - - $tag .= apply_filters( 'style_loader_tag', "\n", $handle ); - } - - $tag .= $end_cond; - - if ( $this->do_concat ) - $this->print_html .= $tag; - else - echo $tag; - - // Could do something with $this->registered[$handle]->extra here to print out extra CSS rules -// 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 ); - return $r; - } - - function _css_href( $src, $ver, $handle ) { - if ( !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); - $src = apply_filters( 'style_loader_src', $src, $handle ); - 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; - } - -} +registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version; + if ( isset($this->args[$handle]) ) + $ver .= '&' . $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']) ) { + $this->concat .= "$handle,"; + $this->concat_version .= "$handle$ver"; + return true; + } + } + + if ( isset($this->registered[$handle]->args) ) + $media = esc_attr( $this->registered[$handle]->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'] ) . "'" : ''; + + $end_cond = $tag = ''; + if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) { + $tag .= "\n"; + } + + $tag .= 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', $this->_css_href( $this->registered[$handle]->src , $ver, "$handle-rtl" )); + else + $rtl_href = $this->_css_href( $this->registered[$handle]->extra['rtl'], $ver, "$handle-rtl" ); + + $tag .= apply_filters( 'style_loader_tag', "\n", $handle ); + } + + $tag .= $end_cond; + + if ( $this->do_concat ) + $this->print_html .= $tag; + else + echo $tag; + + // Could do something with $this->registered[$handle]->extra here to print out extra CSS rules +// 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 ); + return $r; + } + + function _css_href( $src, $ver, $handle ) { + if ( !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); + $src = apply_filters( 'style_loader_src', $src, $handle ); + 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; + } + +}