WP_Dependencies: pass NULL to disable script and style version query strings, props scribu amattie, fixes #11315

git-svn-id: http://svn.automattic.com/wordpress/trunk@12558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz
2009-12-28 00:48:20 +00:00
parent 16e175cc0f
commit 7b40c7a03f
5 changed files with 29 additions and 15 deletions

View File

@@ -35,9 +35,13 @@ 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;
if ( null === $this->registered[$handle]->ver )
$ver = '';
else
$ver = $this->registered[$handle]->ver ? $this->registered[$handle]->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']) ) {
@@ -100,7 +104,8 @@ class WP_Styles extends WP_Dependencies {
$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 );
}