From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 21 Jan 2018 08:54:54 +0000 (+0100)
Subject: Merge branch '2.1' into 3.0
X-Git-Tag: 3.1.0_RC_2~10^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a44e25397ec4c7b78cb3f53dfbbca290a7fbdd01;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.1' into 3.0
---

a44e25397ec4c7b78cb3f53dfbbca290a7fbdd01
diff --cc wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index 591d3a504f,bbe09de46f..05bfd5489f
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@@ -185,6 -188,8 +185,7 @@@ class UserGroupAddForm extends Abstract
  		
  		// reset values
  		$this->groupName = '';
+ 		$this->priority = 0;
 -		$this->optionValues = array();
  		
  		I18nHandler::getInstance()->reset();
  	}