From c2b05dd9c0109b8d417c8140883e1808400f0503 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Mon, 3 Nov 2014 11:43:12 -0500
Subject: Issue #2142441 by Garrett Albright: Fixed CSS aggregator prepends
 data: URLs with paths.

---
 includes/common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 1bfff345b..20cc82be1 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -3804,7 +3804,7 @@ function _drupal_load_stylesheet($matches) {
   // Alter all internal url() paths. Leave external paths alone. We don't need
   // to normalize absolute paths here (i.e. remove folder/... segments) because
   // that will be done later.
-  return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1'. $directory, $file);
+  return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)([^\'")]+)([\'"]?)\s*\)/i', 'url(\1' . $directory . '\2\3)', $file);
 }
 
 /**
-- 
cgit v1.2.3