From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 7 Jan 2013 21:11:47 +0000 (+0100)
Subject: Fixes UserEmailAddressExportForm
X-Git-Tag: 2.0.0_Beta_1~580
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a9ac3e10912a41ee02313071baaec09f04a93333;p=GitHub%2FWoltLab%2FWCF.git

Fixes UserEmailAddressExportForm
---

diff --git a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
index e43e9c6667..c6fd36ce4c 100755
--- a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
@@ -63,7 +63,7 @@ class UserEmailAddressExportForm extends AbstractForm {
 	 * clipboard item type id
 	 * @var	integer
 	 */
-	protected $typeID = null;
+	protected $objectTypeID = null;
 	
 	/**
 	 * @see	wcf\page\IPage::readParameters()
@@ -71,19 +71,21 @@ class UserEmailAddressExportForm extends AbstractForm {
 	public function readParameters() {
 		parent::readParameters();
 		
-		// get type id
-		$this->typeID = ClipboardHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.user');
-		if ($this->typeID === null) {
-			throw new SystemException("clipboard item type 'com.woltlab.wcf.user' is unknown.");
+		// get object type id
+		$this->objectTypeID = ClipboardHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.user');
+		if ($this->objectTypeID === null) {
+			throw new SystemException("Unknown clipboard item type 'com.woltlab.wcf.user'");
 		}
 		
 		// get user ids
-		$users = ClipboardHandler::getInstance()->getMarkedItems($this->typeID);
-		if (!isset($users['com.woltlab.wcf.user']) || empty($users['com.woltlab.wcf.user'])) throw new IllegalLinkException();
+		$users = ClipboardHandler::getInstance()->getMarkedItems($this->objectTypeID);
+		if (empty($users)) {
+			throw new IllegalLinkException();
+		}
 		
 		// load users
-		$this->userIDs = array_keys($users['com.woltlab.wcf.user']);
-		$this->users = $users['com.woltlab.wcf.user'];
+		$this->userIDs = array_keys($users);
+		$this->users = $users;
 	}
 	
 	/**
@@ -148,7 +150,7 @@ class UserEmailAddressExportForm extends AbstractForm {
 		$this->saved();
 		
 		// remove items
-		ClipboardHandler::getInstance()->removeItems($this->typeID);
+		ClipboardHandler::getInstance()->removeItems($this->objectTypeID);
 		
 		exit;
 	}
diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
index f7c44c5f7c..f9d60e67cf 100755
--- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
@@ -174,7 +174,7 @@ class UserMailForm extends AbstractForm {
 				$this->userIDs = array_keys($users);
 			}
 			
-			if (MAIL_USE_FORMATTED_ADDRESS)	{
+			if (MAIL_USE_FORMATTED_ADDRESS) {
 				$this->from = MAIL_FROM_NAME.' <'.MAIL_FROM_ADDRESS.'>';
 			}
 			else {