From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 28 May 2013 22:20:28 +0000 (+0200)
Subject: Fixed missing font family handling
X-Git-Tag: 2.0.0_Beta_1~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0fe74669b59ee67e2251e8471d0e76a03249206;p=GitHub%2FWoltLab%2FWCF.git

Fixed missing font family handling
---

diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
index a3a3281440..7f8c8ee9cb 100644
--- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@ -87,12 +87,6 @@ class StyleAddForm extends AbstractForm {
 	 */
 	public $copyright = '';
 	
-	/**
-	 * font family
-	 * @var	string
-	 */
-	public $fontFamily = '';
-	
 	/**
 	 * list of global variables
 	 * @var	array
@@ -442,7 +436,8 @@ class StyleAddForm extends AbstractForm {
 			'individualLess',
 			'overrideLess',
 			'pageLogo',
-			'useFluidLayout'
+			'useFluidLayout',
+			'wcfBaseFontFamily'
 		);
 		
 		EventHandler::getInstance()->fireAction($this, 'setVariables');
@@ -499,7 +494,7 @@ class StyleAddForm extends AbstractForm {
 		$this->saved();
 		
 		// reset variables
-		$this->authorName = $this->authorURL = $this->copyright = $this->fontFamily = $this->image = '';
+		$this->authorName = $this->authorURL = $this->copyright = $this->image = '';
 		$this->license = $this->styleDate = $this->styleDescription = $this->styleName = $this->styleVersion = '';
 		
 		$this->imagePath = 'images/';
@@ -529,7 +524,6 @@ class StyleAddForm extends AbstractForm {
 			'availableTemplateGroups' => $this->availableTemplateGroups,
 			'availableUnits' => $this->availableUnits,
 			'copyright' => $this->copyright,
-			'fontFamily' => $this->fontFamily,
 			'imagePath' => $this->imagePath,
 			'license' => $this->license,
 			'styleDate' => $this->styleDate,