From 1d6b7c9a990f68f0f9b599d61678c71d40251704 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 15 Jul 2008 17:22:59 +0000
Subject: WP Merge with rev 8339

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1374 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/class.wp-styles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wp-includes/class.wp-styles.php')

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;
 		}
 
-- 
cgit