diff options
| author | David Rothstein <drothstein@gmail.com> | 2014-11-03 11:43:12 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2014-11-03 11:43:12 -0500 |
| commit | c2b05dd9c0109b8d417c8140883e1808400f0503 (patch) | |
| tree | 3e56ceaabfbb71a0ee00ce98796980dfb921e573 /includes | |
| parent | af4cde1b8fc393c16051ffc275acf94371c68236 (diff) | |
| download | brdo-c2b05dd9c0109b8d417c8140883e1808400f0503.tar.gz brdo-c2b05dd9c0109b8d417c8140883e1808400f0503.tar.bz2 | |
Issue #2142441 by Garrett Albright: Fixed CSS aggregator prepends data: URLs with paths.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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); } /** |