From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 5 Jun 2013 17:44:01 +0000 (+0200)
Subject: Added missing module setting
X-Git-Tag: 2.0.0_Beta_4~126
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=789a109cc431e4e19e5bb960db72a888ce61d47a;p=GitHub%2FWoltLab%2FWCF.git

Added missing module setting
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 7cbbc3bba2..3f145ffb8e 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -274,6 +274,11 @@
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
 			</option>
+			<option name="module_members_list">
+				<categoryname>module.user</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="module_team_page">
 				<categoryname>module.user</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/com.woltlab.wcf/pageMenu.xml b/com.woltlab.wcf/pageMenu.xml
index 4cca9197b1..6badd051c8 100644
--- a/com.woltlab.wcf/pageMenu.xml
+++ b/com.woltlab.wcf/pageMenu.xml
@@ -11,6 +11,7 @@
 			<controller><![CDATA[wcf\page\MembersListPage]]></controller>
 			<position>header</position>
 			<permissions>user.profile.canViewMembersList</permissions>
+			<options>module_members_list</options>
 		</pagemenuitem>
 		
 		<pagemenuitem name="wcf.user.recentActivity">
@@ -40,6 +41,7 @@
 			<position>header</position>
 			<parent>wcf.user.members</parent>
 			<permissions>user.profile.canViewMembersList</permissions>
+			<options>module_members_list</options>
 		</pagemenuitem>
 	</import>
 </data>
\ No newline at end of file
diff --git a/wcfsetup/install/files/lib/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/form/UserSearchForm.class.php
index b51554db20..165de4ed41 100644
--- a/wcfsetup/install/files/lib/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/form/UserSearchForm.class.php
@@ -28,6 +28,11 @@ class UserSearchForm extends UserOptionListForm {
 	 */
 	public $activeMenuItem = 'wcf.user.search';
 	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededModules
+	 */
+	public $neededModules = array('MODULE_MEMBERS_LIST');
+	
 	/**
 	 * username
 	 * @var	string
diff --git a/wcfsetup/install/files/lib/page/MembersListPage.class.php b/wcfsetup/install/files/lib/page/MembersListPage.class.php
index 81cdd66166..e7c6d2eac4 100644
--- a/wcfsetup/install/files/lib/page/MembersListPage.class.php
+++ b/wcfsetup/install/files/lib/page/MembersListPage.class.php
@@ -35,6 +35,11 @@ class MembersListPage extends SortablePage {
 	 */
 	public $neededPermissions = array('user.profile.canViewMembersList');
 	
+	/**
+	 * @see	wcf\page\AbstractPage::$neededModules
+	 */
+	public $neededModules = array('MODULE_MEMBERS_LIST');
+	
 	/**
 	 * @see	wcf\page\AbstractPage::$enableTracking
 	 */
diff --git a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
index 8a0a8fae9a..9ade13e5ec 100644
--- a/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
+++ b/wcfsetup/install/files/lib/page/RecentActivityListPage.class.php
@@ -40,7 +40,7 @@ class RecentActivityListPage extends AbstractPage {
 		$this->eventList->readObjects();
 		
 		// add breadcrumbs
-		WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
+		if (MODULE_MEMBERS_LIST) WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/page/TeamPage.class.php b/wcfsetup/install/files/lib/page/TeamPage.class.php
index ffc422950a..6df1dc69fb 100644
--- a/wcfsetup/install/files/lib/page/TeamPage.class.php
+++ b/wcfsetup/install/files/lib/page/TeamPage.class.php
@@ -64,7 +64,7 @@ class TeamPage extends MultipleLinkPage {
 		parent::readData();
 		
 		// add breadcrumbs
-		WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
+		if (MODULE_MEMBERS_LIST) WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/page/UserPage.class.php b/wcfsetup/install/files/lib/page/UserPage.class.php
index f7511870e2..a8f2687734 100644
--- a/wcfsetup/install/files/lib/page/UserPage.class.php
+++ b/wcfsetup/install/files/lib/page/UserPage.class.php
@@ -117,7 +117,7 @@ class UserPage extends AbstractPage {
 		parent::readData();
 		
 		// add breadcrumbs
-		WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
+		if (MODULE_MEMBERS_LIST) WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
 		
 		// get profile content
 		if ($this->editOnInit) {
diff --git a/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php b/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
index ed6e032c20..d46c674181 100644
--- a/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
+++ b/wcfsetup/install/files/lib/page/UsersOnlineListPage.class.php
@@ -91,7 +91,7 @@ class UsersOnlineListPage extends SortablePage {
 		parent::readData();
 		
 		// add breadcrumbs
-		WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
+		if (MODULE_MEMBERS_LIST) WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get('wcf.user.members'), LinkHandler::getInstance()->getLink('MembersList')));
 		
 		// load locations
 		foreach (ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.user.online.location') as $objectType) {
diff --git a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
index bae7042a6d..dc57ba29f1 100644
--- a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
@@ -161,13 +161,15 @@ abstract class TreeMenu extends SingletonFactory {
 	 * @param	string		$menuItem	name of the active menu item
 	 */
 	public function setActiveMenuItem($menuItem) {
-		$this->activeMenuItems = array();
-		
-		// build active menu list
+		$newActiveMenuItems = array();
 		while (isset($this->menuItemList[$menuItem])) {
-			$this->activeMenuItems[] = $menuItem;
+			$newActiveMenuItems[] = $menuItem;
 			$menuItem = $this->menuItemList[$menuItem]->parentMenuItem;
+			
+			if ($menuItem && !isset($this->menuItemList[$menuItem])) return false;
 		}
+		
+		if (!empty($newActiveMenuItems)) $this->activeMenuItems = $newActiveMenuItems;
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 3cc9238971..60483a3712 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -778,6 +778,7 @@
 		<item name="wcf.acp.option.module_poll"><![CDATA[Umfragen]]></item>
 		<item name="wcf.acp.option.poll_max_options"><![CDATA[Maximale Anzahl an Antworten]]></item>
 		<item name="wcf.acp.option.error.validationFailed"><![CDATA[Sie haben einen ungültigen Inhalt eingegeben.]]></item>
+		<item name="wcf.acp.option.module_members_list"><![CDATA[Mitgliederliste]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index f2e0db8569..899e0bbe70 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -777,6 +777,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.module_poll"><![CDATA[Polls]]></item>
 		<item name="wcf.acp.option.poll_max_options"><![CDATA[Maximum number of options]]></item>
 		<item name="wcf.acp.option.error.validationFailed"><![CDATA[TOOD: Sie haben einen ungültigen Inhalt eingegeben.]]></item>
+		<item name="wcf.acp.option.module_members_list"><![CDATA[Members List]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">