Fixes UserMailForm

diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
index cfe5c8658a231c803c0574f94004e69a091814dd..f7c44c5f7cffc6b0d3725abb7dc5da0b29c5a16c 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
@@ -15,7 +15,7 @@ use wcf\util\StringUtil;
  * Shows the user mail form.
  * 
  * @author     Marcel Werk
- * @copyright  2001-2012 WoltLab GmbH
+ * @copyright  2001-2013 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf
  * @subpackage acp.form
@@ -159,21 +159,27 @@ class UserMailForm extends AbstractForm {
                        // get marked user ids
                        if (empty($this->action)) {
                                // get type id
-                               $typeID = ClipboardHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.user');
-                               if ($typeID === null) {
-                                       throw new SystemException("clipboard item type 'com.woltlab.wcf.user' is unknown.");
+                               $objectTypeID = ClipboardHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.user');
+                               if ($objectTypeID === null) {
+                                       throw new SystemException("Unknown clipboard item type 'com.woltlab.wcf.user'");
                                }
                                
                                // get user ids
-                               $users = ClipboardHandler::getInstance()->getMarkedItems($typeID);
-                               if (!isset($users['com.woltlab.wcf.user']) || empty($users['com.woltlab.wcf.user'])) throw new IllegalLinkException();
+                               $users = ClipboardHandler::getInstance()->getMarkedItems($objectTypeID);
+                               if (empty($users)) {
+                                       throw new IllegalLinkException();
+                               }
                                
                                // load users
-                               $this->userIDs = array_keys($users['com.woltlab.wcf.user']);
+                               $this->userIDs = array_keys($users);
                        }
                        
-                       if (MAIL_USE_FORMATTED_ADDRESS) $this->from = MAIL_FROM_NAME . ' <' . MAIL_FROM_ADDRESS . '>';
-                       else $this->from = MAIL_FROM_ADDRESS;
+                       if (MAIL_USE_FORMATTED_ADDRESS) {
+                               $this->from = MAIL_FROM_NAME.' <'.MAIL_FROM_ADDRESS.'>';
+                       }
+                       else {
+                               $this->from = MAIL_FROM_ADDRESS;
+                       }
                }
                
                if (!empty($this->userIDs)) {