diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-15 17:22:59 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-15 17:22:59 +0000 |
| commit | 1d6b7c9a990f68f0f9b599d61678c71d40251704 (patch) | |
| tree | 8f6f5206f365be2062ff98c3be887d47899b1a2a /wp-includes/class.wp-styles.php | |
| parent | a8a5dc5214b92fc26003983f599dd25e88660084 (diff) | |
| download | wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.tar.gz wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.tar.xz wordpress-mu-1d6b7c9a990f68f0f9b599d61678c71d40251704.zip | |
WP Merge with rev 8339
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1374 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/class.wp-styles.php')
| -rw-r--r-- | wp-includes/class.wp-styles.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php index f6a6d79..8533943 100644 --- a/wp-includes/class.wp-styles.php +++ b/wp-includes/class.wp-styles.php @@ -59,7 +59,7 @@ class WP_Styles extends WP_Dependencies { } function _css_href( $src, $ver, $handle ) { - if ( !preg_match('|^https?://|', $src) ) { + if ( !preg_match('|^https?://|', $src) && !preg_match('|^' . preg_quote(WP_CONTENT_URL) . '|', $src) ) { $src = $this->base_url . $src; } |