diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-07-01 20:22:22 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-07-01 20:22:22 +0000 |
| commit | fae9063c681b11cc48347a11b4dc0f06baffb4ce (patch) | |
| tree | 76d67d82618930bbfdffe7b5bfa8ff35bb7bb866 /includes/common.inc | |
| parent | 0d76c733e7873f2451763e77d3c840c8d95cdf85 (diff) | |
| download | brdo-fae9063c681b11cc48347a11b4dc0f06baffb4ce.tar.gz brdo-fae9063c681b11cc48347a11b4dc0f06baffb4ce.tar.bz2 | |
- Patch #197124 by dixon_, keith.smith: made it possible to ignore a theme's stylesheets.
Diffstat (limited to 'includes/common.inc')
| -rw-r--r-- | includes/common.inc | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/includes/common.inc b/includes/common.inc index 9ec58b08e..c9127a5bd 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1728,19 +1728,22 @@ function drupal_get_css($css = NULL) { unset($types[$type][$file]); continue; } - if (!$preprocess || !($is_writable && $preprocess_css)) { - // If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*, - // regardless of whether preprocessing is on or off. - if (!$preprocess && $type == 'module') { - $no_module_preprocess .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n"; - } - // If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*, - // regardless of whether preprocessing is on or off. - else if (!$preprocess && $type == 'theme') { - $no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n"; - } - else { - $output .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n"; + // Only include the stylesheet if it exists. + if (file_exists($file)) { + if (!$preprocess || !($is_writable && $preprocess_css)) { + // If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*, + // regardless of whether preprocessing is on or off. + if (!$preprocess && $type == 'module') { + $no_module_preprocess .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n"; + } + // If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*, + // regardless of whether preprocessing is on or off. + else if (!$preprocess && $type == 'theme') { + $no_theme_preprocess .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n"; + } + else { + $output .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . base_path() . $file . $query_string . '" />' . "\n"; + } } } } |