From 1278b47703c7007ff49abb66bf5daa8ff0fe390b Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 25 Dec 2012 19:10:24 +0100
Subject: [PATCH] Changed wcf1_page_menu_item structure

See #998
See #1000
---
 .../plugin/PageMenuPackageInstallationPlugin.class.php | 10 ++++++++++
 wcfsetup/setup/db/install.sql                          |  1 +
 2 files changed, 11 insertions(+)

diff --git a/wcfsetup/install/files/lib/system/package/plugin/PageMenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/PageMenuPackageInstallationPlugin.class.php
index 903efba3fb..a9ee513d85 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/PageMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PageMenuPackageInstallationPlugin.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\package\plugin;
+use wcf\system\exception\SystemException;
 
 /**
  * Installs, updates and deletes page page menu items.
@@ -25,11 +26,20 @@ class PageMenuPackageInstallationPlugin extends AbstractMenuPackageInstallationP
 		
 		// position
 		$result['menuPosition'] = (!empty($data['elements']['position']) && $data['elements']['position'] == 'footer') ? 'footer' : 'header';
+		
+		// controller
+		$result['menuItemController'] = (isset($data['elements']['controller'])) ? $data['elements']['controller'] : '';
+		
 		// class name
 		if (!empty($data['elements']['classname'])) {
 			$result['className'] = $data['elements']['classname'];
 		}
 		
+		// validate controller and link (cannot be empty at the same time)
+		if (empty($result['menuItemLink']) && empty($result['menuItemController'])) {
+			throw new SystemException("Menu item '".$result['menuItem']."' neither has a link nor a controller given");
+		}
+		
 		return $result;
 	}
 }
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 6c12e15dba..928a6263db 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -470,6 +470,7 @@ CREATE TABLE wcf1_page_menu_item (
 	packageID INT(10) NOT NULL,
 	menuItem VARCHAR(255) NOT NULL DEFAULT '',
 	parentMenuItem VARCHAR(255) NOT NULL DEFAULT '',
+	menuItemController VARCHAR(255) NOT NULL DEFAULT '',
 	menuItemLink VARCHAR(255) NOT NULL DEFAULT '',
 	menuPosition ENUM('header', 'footer') NOT NULL DEFAULT 'header',
 	showOrder INT(10) NOT NULL DEFAULT 0,
-- 
2.20.1