diff options
author | Dries Buytaert <dries@buytaert.net> | 2007-10-02 16:19:23 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2007-10-02 16:19:23 +0000 |
commit | d2d93b4bd3740be11ba771a662fa8a63d76fe5a2 (patch) | |
tree | 301195782c85c77389067d8cd9ed47f6470811f2 /includes | |
parent | 4bb5080ebe210c5fc0e90549dcacfb088d4cbce3 (diff) | |
download | brdo-d2d93b4bd3740be11ba771a662fa8a63d76fe5a2.tar.gz brdo-d2d93b4bd3740be11ba771a662fa8a63d76fe5a2.tar.bz2 |
- Patch #173486 by scor: fixed code style issues.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/common.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/includes/common.inc b/includes/common.inc index 12051c7a9..0ad9d2428 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1601,7 +1601,7 @@ function drupal_get_css($css = NULL) { $no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file .'" />'."\n"; } else { - $output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file . '" />'."\n"; + $output .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. base_path() . $file .'" />'."\n"; } } } @@ -1648,7 +1648,7 @@ function drupal_build_css_cache($types, $filename) { // Wraps all @import arguments in url(). $contents = preg_replace('/@import\s+(?!url)[\'"]?(\S*)\b[\'"]?/i', '@import url("\1")', $contents); // Fix all paths within this CSS file, ignoring absolute paths. - $data .= preg_replace('/url\(([\'"]?)(?![a-z]+:)/i', 'url(\1'. $path . '\2', $contents); + $data .= preg_replace('/url\(([\'"]?)(?![a-z]+:)/i', 'url(\1'. $path .'\2', $contents); } } } @@ -1879,7 +1879,7 @@ function drupal_build_js_cache($files, $filename) { foreach ($files as $path => $info) { if ($info['preprocess']) { // Append a ';' after each JS file to prevent them from running together. - $contents .= _drupal_compress_js(file_get_contents($path). ';'); + $contents .= _drupal_compress_js(file_get_contents($path) .';'); } } @@ -1982,9 +1982,9 @@ function _packer_apply($script, $regexps, $escape = FALSE) { $regexp = '/'; foreach ($_regexps as $_regexp) { list($expression) = $_regexp; - $regexp .= '(' . substr($expression, 1, -1) . ')|'; + $regexp .= '('. substr($expression, 1, -1) .')|'; } - $regexp = substr($regexp, 0, -1) . '/'; + $regexp = substr($regexp, 0, -1) .'/'; // In order to simplify the regexps that look e.g. for quoted strings, we // remove all escaped characters (such as \' or \") from the data. Then, we |