From 2af34948dd2d1da0ef1ea24d15796efc8be5cc50 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 10 Jun 2013 20:21:23 +0200
Subject: [PATCH] Fixed cookie domain handling

---
 .../data/application/ApplicationAction.class.php    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php b/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php
index 9029d08b46..1439613a0c 100644
--- a/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php
+++ b/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php
@@ -1,5 +1,7 @@
 <?php
 namespace wcf\data\application;
+use wcf\util\StringUtil;
+
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
@@ -45,11 +47,16 @@ class ApplicationAction extends AbstractDatabaseObjectAction {
 		// calculate cookie path
 		$domains = array();
 		foreach ($this->objects as $application) {
-			if (!isset($domains[$application->domainName])) {
-				$domains[$application->domainName] = array();
+			$domainName = $application->domainName;
+			if (StringUtil::endsWith($domainName, $application->cookieDomain)) {
+				$domainName = $application->cookieDomain;
+			}
+			
+			if (!isset($domains[$domainName])) {
+				$domains[$domainName] = array();
 			}
 			
-			$domains[$application->domainName][$application->packageID] = explode('/', FileUtil::removeLeadingSlash(FileUtil::removeTrailingSlash($application->domainPath)));
+			$domains[$domainName][$application->packageID] = explode('/', FileUtil::removeLeadingSlash(FileUtil::removeTrailingSlash($application->domainPath)));
 		}
 		
 		WCF::getDB()->beginTransaction();
-- 
2.20.1