diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-22 21:54:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-22 21:54:08 +0200 |
| commit | c4a65a469709a8ffdeb52f9d3556545993f2347a (patch) | |
| tree | 8c48a3982cd5b4182145d8923fd3f10d6a6b4e98 /phpBB/includes | |
| parent | dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317 (diff) | |
| parent | cd46b399678db9f7a10f6395b2920135800c41fd (diff) | |
| download | forums-c4a65a469709a8ffdeb52f9d3556545993f2347a.tar forums-c4a65a469709a8ffdeb52f9d3556545993f2347a.tar.gz forums-c4a65a469709a8ffdeb52f9d3556545993f2347a.tar.bz2 forums-c4a65a469709a8ffdeb52f9d3556545993f2347a.tar.xz forums-c4a65a469709a8ffdeb52f9d3556545993f2347a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/7260] Don't delete poll if one exists and editing user lacks permission
[ticket/9646] Honor CSS comments in @import statements
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 3310560c73..95b700c876 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -2531,13 +2531,21 @@ parse_css_file = {PARSE_CSS_FILE} // Match CSS imports $matches = array(); - preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches); + preg_match_all('/@import url\((["\'])(.*)\1\);/i', $stylesheet, $matches); + + // remove commented stylesheets (very simple parser, allows only whitespace + // around an @import statement) + preg_match_all('#/\*\s*@import url\((["\'])(.*)\1\);\s\*/#i', $stylesheet, $commented); + $matches[2] = array_diff($matches[2], $commented[2]); if (sizeof($matches)) { foreach ($matches[0] as $idx => $match) { - $stylesheet = str_replace($match, acp_styles::load_css_file($theme_row['theme_path'], $matches[1][$idx]), $stylesheet); + if (isset($matches[2][$idx])) + { + $stylesheet = str_replace($match, acp_styles::load_css_file($theme_row['theme_path'], $matches[2][$idx]), $stylesheet); + } } } |