Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Handle variables and functions when importing style sheets (see #7448)
Browse files Browse the repository at this point in the history
  • Loading branch information
leofeyer committed Jan 30, 2015
1 parent 6e6f957 commit 1ea2153
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions system/docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Contao Open Source CMS changelog
Version 3.2.18 (2015-XX-XX)
---------------------------

### Fixed
Handle variables and functions when importing style sheets (see #7448).

### Fixed
Fix an infinite recursion problem in the `FilesModel` class (see #7588).

Expand Down
4 changes: 2 additions & 2 deletions system/modules/core/classes/StyleSheets.php
Original file line number Diff line number Diff line change
Expand Up @@ -1379,8 +1379,8 @@ protected function createDefinition($arrDefinition)
continue;
}

// Handle important definitions
if (strpos($strDefinition, 'important') !== false || strpos($strDefinition, 'transparent') !== false || strpos($strDefinition, 'inherit') !== false)
// Handle keywords, variables and functions (see #7448)
if (strpos($strDefinition, 'important') !== false || strpos($strDefinition, 'transparent') !== false || strpos($strDefinition, 'inherit') !== false || strpos($strDefinition, '$') !== false || strpos($strDefinition, '(') !== false)
{
$arrSet['own'][] = $strDefinition;
continue;
Expand Down

0 comments on commit 1ea2153

Please sign in to comment.