diff options
| author | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
| commit | d90a79c0ee1837353622e4b2abb0753ca09dffd2 (patch) | |
| tree | 554da8dc13606efc2bc1ea7fe3697a5ff87d02e5 /inc/lessc.inc.php | |
| parent | f2643d9ff318af1d2fbb6249e929212381959247 (diff) | |
| parent | a83975113c7725a13144b3e65bfb58c8447d37d7 (diff) | |
| download | rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.gz rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.bz2 | |
Merge remote-tracking branch 'origin/diff_navigation' into revisions
Conflicts:
inc/parser/xhtml.php
Diffstat (limited to 'inc/lessc.inc.php')
| -rw-r--r-- | inc/lessc.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/lessc.inc.php b/inc/lessc.inc.php index 0699de52f..3d0ed768a 100644 --- a/inc/lessc.inc.php +++ b/inc/lessc.inc.php @@ -708,7 +708,7 @@ class lessc { } $oldParent = $mixin->parent; - if ($mixin != $block) $mixin->parent = $block; + if ($mixin !== $block) $mixin->parent = $block; foreach ($this->sortProps($mixin->props) as $subProp) { if ($suffix !== null && |