From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 23 Jul 2020 10:31:26 +0000 (+0200)
Subject: Merge branch '5.2'
X-Git-Tag: 5.3.0_Alpha_1~122
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=37068ba7a9088425df1879235e6e720bf8c06f23;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2'
---

37068ba7a9088425df1879235e6e720bf8c06f23
diff --cc wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
index b3ec316a21,419ec8c8c4..71b680dcf0
--- a/wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
@@@ -70,9 -70,9 +70,9 @@@ class SuffixFormFieldContainer extends 
  	}
  	
  	/**
 -	 * Returns the intial option of the suffix selection dropdown.
 +	 * Returns the initial option of the suffix selection dropdown.
  	 * 
- 	 * @return	string
+ 	 * @return	array
  	 * @throws	\BadMethodCallException		if no suffix field is set or has no options
  	 */
  	public function getSelectedSuffixOption() {