From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 20 Jun 2018 15:46:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.4~21
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=17c3fdfff6432d9bed73bcb4cb494115d5935de6;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'
---

17c3fdfff6432d9bed73bcb4cb494115d5935de6
diff --cc wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
index 1442064338,d28b9d99a3..9a48d55317
--- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@@ -650,9 -605,13 +648,15 @@@ class StyleAddForm extends AbstractFor
  			'styleVersion' => $this->styleVersion,
  			'templateGroupID' => $this->templateGroupID,
  			'tmpHash' => $this->tmpHash,
 -			'variables' => $this->variables
 +			'variables' => $this->variables,
 +			'supportedApiVersions' => Style::$supportedApiVersions,
 +			'newVariables' => $this->newVariables
  		]);
  	}
+ 	
+ 	protected function setDefaultValues() {
+ 		$this->authorName = WCF::getUser()->username;
+ 		$this->styleDate = gmdate('Y-m-d', TIME_NOW);
+ 		$this->styleVersion = '1.0.0';
+ 	}
  }