From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 24 Dec 2015 11:00:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next-lantia' into next-lantia
X-Git-Tag: 3.0.0_Beta_1~2030^2~207
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e7569755f71d77d2424b57fc278e9e38890cf83d;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'origin/next-lantia' into next-lantia

# Conflicts:
#	com.woltlab.wcf/acpMenu.xml
#	wcfsetup/install/files/lib/system/request/LinkHandler.class.php
---

e7569755f71d77d2424b57fc278e9e38890cf83d
diff --cc com.woltlab.wcf/acpMenu.xml
index 1364dd8150,e0f5acc146..29818e763c
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@@ -617,14 -617,6 +617,12 @@@
  			<parent>wcf.acp.menu.link.cms</parent>
  			<permissions>admin.content.cms.canManagePage</permissions>
  		</acpmenuitem>
- 		
 +		<acpmenuitem name="wcf.acp.menu.link.cms.page.landing">
 +			<controller><![CDATA[wcf\acp\form\PageLandingForm]]></controller>
 +			<parent>wcf.acp.menu.link.cms.page.list</parent>
 +			<permissions>admin.content.cms.canManagePage</permissions>
 +			<icon>fa-home</icon>
 +		</acpmenuitem>
- 		
  		<acpmenuitem name="wcf.acp.menu.link.cms.page.add">
  			<controller><![CDATA[wcf\acp\form\PageAddForm]]></controller>
  			<parent>wcf.acp.menu.link.cms.page.list</parent>
diff --cc wcfsetup/install/files/lib/data/box/Box.class.php
index 6eea110546,60f4391c45..58c2f37a04
--- a/wcfsetup/install/files/lib/data/box/Box.class.php
+++ b/wcfsetup/install/files/lib/data/box/Box.class.php
@@@ -180,13 -176,57 +181,61 @@@ class Box extends DatabaseObject 
  	}
  	
  	public function getMenu() {
 -		// @todo
 +		if ($this->menu === null) {
 +			$this->menu = MenuCache::getInstance()->getMenuByID($this->menuID);
 +		}
 +		
 +		return $this->menu;
  	}
  	
+ 	/**
+ 	 * Returns the image of this box.
+ 	 * 
+ 	 * @return      \wcf\data\media\Media
+ 	 */
+ 	public function getImage() {
+ 		if ($this->boxType == 'system') {
+ 			return $this->getController()->getImage();
+ 		}
+ 		else if ($this->boxType == 'menu') {
+ 			return null;
+ 		}
+ 		else {
+ 			// @todo
+ 		}
+ 		
+ 		return null;
+ 	}
+ 	
+ 	/**
+ 	 * Returns true if this box has an image.
+ 	 *
+ 	 * @return      boolean
+ 	 */
+ 	public function hasImage() {
+ 		if ($this->boxType == 'system') {
+ 			return $this->getController()->hasImage();
+ 		}
+ 		else if ($this->boxType == 'menu') {
+ 			return false;
+ 		}
+ 		else {
+ 			// @todo
+ 		}
+ 		
+ 		return false;
+ 	}
+ 	
+ 	public function getLink() {
+ 		// @todo
+ 		return '';
+ 	}
+ 	
+ 	public function hasLink() {
+ 		// @todo
+ 		return false;
+ 	}
+ 	
  	/**
  	 * Returns the box with the given name.
  	 *
diff --cc wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
index 6739726de2,b97c2ed4b3..7fa9572f3e
--- a/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
@@@ -17,14 -14,9 +17,15 @@@ use wcf\system\WCF
   * @package	com.woltlab.wcf
   * @subpackage	acp.package.plugin
   * @category	Community Framework
+  * @since	2.2
   */
  class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin {
 +	/**
 +	 * box meta data per menu
 +	 * @var string[]
 +	 */
 +	public $boxData = [];
 +	
  	/**
  	 * @inheritDoc
  	 */