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

diff --cc com.woltlab.wcf/acpMenu.xml
index 1364dd815030bef51eee5299d342a9ac644e126e,e0f5acc1464517746d5f4f493924900c1ff1ebad..29818e763c0b235f8b8539759802e1ae55b10f14
--- 1/com.woltlab.wcf/acpMenu.xml
--- 2/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/acp/form/PageAddForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/box/Box.class.php
index 6eea110546e7bcbeb058893667d785b05b5c3c1a,60f4391c456c6b6760e3a01f3d5f382b7485f2a5..58c2f37a0451d7ce44476048f43b2e76df9389c3
--- 1/wcfsetup/install/files/lib/data/box/Box.class.php
--- 2/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/data/menu/item/MenuItemNodeTree.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/page/Page.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/box/BoxHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
index 6739726de2c0513541e01cb591f4239ad27127e9,b97c2ed4b342e9747125c093c8ca97ca333aad34..7fa9572f3e393981cfff882e7a9d84b5af4b973e
--- 1/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
--- 2/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
         */

diff --cc wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/request/ControllerMap.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/request/LinkHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/util/exception/CryptoException.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge

diff --cc wcfsetup/setup/db/install.sql
Simple merge