Fixed style handling

diff --git a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
index 5664591632d3cf1a4e10b28deebb7a67ef2af607..c0e4576f137781dc838dfbeee2e5faa1417bbcc7 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
@@ -113,14 +113,13 @@ class StyleEditForm extends StyleAddForm {
        public function save() {
                AbstractForm::save();
                
-               // TODO: how should this actually work?
-               /*if (!$this->style->isTainted) {
+               if (!$this->style->isTainted) {
                        $this->variables['individualScss'] = Style::joinLessVariables($this->variables['individualScss'], $this->variables['individualScssCustom']);
                        $this->variables['overrideScss'] = Style::joinLessVariables($this->variables['overrideScss'], $this->variables['overrideScssCustom']);
                        
                        unset($this->variables['individualScssCustom']);
                        unset($this->variables['overrideScssCustom']);
-               }*/
+               }
                
                $this->objectAction = new StyleAction([$this->style], 'update', [
                        'data' => array_merge($this->additionalFields, [
@@ -149,6 +148,16 @@ class StyleEditForm extends StyleAddForm {
                // reload style object to update preview image
                $this->style = new Style($this->style->styleID);
                
+               if (!$this->style->isTainted) {
+                       $tmp = Style::splitLessVariables($this->variables['individualScss']);
+                       $this->variables['individualScss'] = $tmp['preset'];
+                       $this->variables['individualScssCustom'] = $tmp['custom'];
+                       
+                       $tmp = Style::splitLessVariables($this->variables['overrideScss']);
+                       $this->variables['overrideScss'] = $tmp['preset'];
+                       $this->variables['overrideScssCustom'] = $tmp['custom'];
+               }
+               
                WCF::getTPL()->assign('success', true);
        }
        
@@ -162,6 +171,7 @@ class StyleEditForm extends StyleAddForm {
                
                WCF::getTPL()->assign([
                        'action' => 'edit',
+                       'isTainted' => $this->style->isTainted,
                        'style' => $this->style,
                        'styleID' => $this->styleID
                ]);