From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 21 Dec 2015 10:22:18 +0000 (+0100)
Subject: Merge branch 'next' into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~207^2~8^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b1ea359492ff4f91e05ea42ebc475fcdcd3c4b32;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' into next-lantia
---

b1ea359492ff4f91e05ea42ebc475fcdcd3c4b32
diff --cc wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
index ad0fa94e87,4c5674e2ce..cbb2071b39
--- a/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
@@@ -17,19 -17,9 +17,20 @@@ class ACPMenuPackageInstallationPlugin 
  	 */
  	public $className = 'wcf\data\acp\menu\item\ACPMenuItemEditor';
  	
 +	/**
 +	 * @see \wcf\system\package\plugin\AbstractMenuPackageInstallationPlugin::prepareImport()
 +	 */
 +	protected function prepareImport(array $data) {
 +		$returnValue = parent::prepareImport($data);
 +		
 +		$returnValue['icon'] = (isset($data['elements']['icon'])) ? $data['elements']['icon'] : '';
 +		
 +		return $returnValue;
 +	}
 +	
  	/**
  	 * @see	\wcf\system\package\plugin\IPackageInstallationPlugin::getDefaultFilename()
+ 	 * @since	2.2
  	 */
  	public static function getDefaultFilename() {
  		return 'acpMenu.xml';