From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 7 Jun 2013 21:33:42 +0000 (+0200)
Subject: Added missing setting
X-Git-Tag: 2.0.0_Beta_4~105
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a1faa664017e9f404be96747d165ccb0293c8915;p=GitHub%2FWoltLab%2FWCF.git

Added missing setting
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 95d3511b03..847bda13a1 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -874,6 +874,11 @@ no:!cache_source_memcached_host]]></enableoptions>
 				<defaultvalue>182</defaultvalue>
 				<minvalue>0</minvalue>
 			</option>
+			<option name="profile_enable_visitors">
+				<categoryname>user.profile</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<!-- /user.profile -->
 			
 			<!-- user.list.members -->
diff --git a/wcfsetup/install/files/lib/page/UserPage.class.php b/wcfsetup/install/files/lib/page/UserPage.class.php
index a8f2687734..31ee1367fb 100644
--- a/wcfsetup/install/files/lib/page/UserPage.class.php
+++ b/wcfsetup/install/files/lib/page/UserPage.class.php
@@ -143,10 +143,12 @@ class UserPage extends AbstractPage {
 		$this->followingList->readObjects();
 		
 		// get visitors
-		$this->visitorList = new UserProfileVisitorList();
-		$this->visitorList->getConditionBuilder()->add('user_profile_visitor.ownerID = ?', array($this->userID));
-		$this->visitorList->sqlLimit = 10;
-		$this->visitorList->readObjects();
+		if (PROFILE_ENABLE_VISITORS) {
+			$this->visitorList = new UserProfileVisitorList();
+			$this->visitorList->getConditionBuilder()->add('user_profile_visitor.ownerID = ?', array($this->userID));
+			$this->visitorList->sqlLimit = 10;
+			$this->visitorList->readObjects();
+		}
 		
 		MetaTagHandler::getInstance()->addTag('og:url', 'og:url', LinkHandler::getInstance()->getLink('User', array('object' => $this->user->getDecoratedObject())), true);
 		MetaTagHandler::getInstance()->addTag('og:type', 'og:type', 'profile', true);
@@ -171,8 +173,8 @@ class UserPage extends AbstractPage {
 			'followerCount' => $this->followerList->countObjects(),
 			'following' => $this->followingList->getObjects(),
 			'followingCount' => $this->followingList->countObjects(),
-			'visitors' => $this->visitorList->getObjects(),
-			'visitorCount' => $this->visitorList->countObjects(),
+			'visitors' => ($this->visitorList !== null ? $this->visitorList->getObjects() : array()),
+			'visitorCount' => ($this->visitorList !== null ? $this->visitorList->countObjects() : 0),
 			'allowSpidersToIndexThisPage' => true
 		));
 	}
@@ -187,7 +189,7 @@ class UserPage extends AbstractPage {
 			$editor->updateCounters(array('profileHits' => 1));
 			
 			// save visitor
-			if (WCF::getUser()->userID && !WCF::getUser()->invisible) {
+			if (PROFILE_ENABLE_VISITORS && WCF::getUser()->userID && !WCF::getUser()->invisible) {
 				if (($visitor = UserProfileVisitor::getObject($this->user->userID, WCF::getUser()->userID)) !== null) {
 					$editor = new UserProfileVisitorEditor($visitor);
 					$editor->update(array(
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index eeae882054..c6b049fa40 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -782,6 +782,7 @@
 		<item name="wcf.acp.option.module_members_list"><![CDATA[Mitgliederliste]]></item>
 		<item name="wcf.acp.option.footer_code"><![CDATA[Footer-Code]]></item>
 		<item name="wcf.acp.option.footer_code.description"><![CDATA[Der hier angegebene Code wird im Fußbereich jeder Seite ausgegeben. Der Footer-Code eignet sich z.B. sehr gut für die Einbindung von Diensten wie „Google Analytics“ oder „Piwik“.]]></item>
+		<item name="wcf.acp.option.profile_enable_visitors"><![CDATA[Profil-Besucher anzeigen]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2d19e03039..fd6b253218 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -781,6 +781,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.option.module_members_list"><![CDATA[Members List]]></item>
 		<item name="wcf.acp.option.footer_code"><![CDATA[TOOD: Footer-Code]]></item>
 		<item name="wcf.acp.option.footer_code.description"><![CDATA[TOOD: Der hier angegebene Code wird im Fußbereich jeder Seite ausgegeben. Der Footer-Code eignet sich z.B. sehr gut für die Einbindung von Diensten wie „Google Analytics“ oder „Piwik“.]]></item>
+		<item name="wcf.acp.option.profile_enable_visitors"><![CDATA[TODO: Profil-Besucher anzeigen]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">