Merge pull request #952 from Gravatronics/bug/clipboardTypeData
authorAlexander Ebert <ebert@woltlab.com>
Mon, 17 Dec 2012 16:00:05 +0000 (08:00 -0800)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 17 Dec 2012 16:00:05 +0000 (08:00 -0800)
Fixes erroneous clipboard behaviour related to type data

1  2 
wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php

index f94bc44f6bab00425abfdc42d34fb959abd2d6b9,e05a330c45692283a9d6b241bab0be2fb68c483e..fa0b39829960486d1f6d5c1f7f8c89a456b0d131
@@@ -322,13 -287,8 +322,8 @@@ class ClipboardHandler extends Singleto
                foreach ($actions as $actionData) {
                        // get accepted objects
                        $typeName = $actionData['object']->getTypeName();
 -                      if (!isset($this->markedItems[$typeName])) continue;
 +                      if (!isset($this->markedItems[$typeName]) || empty($this->markedItems[$typeName])) continue;
                        
-                       $editorData[$typeName] = array(
-                               'label' => $actionData['object']->getEditorLabel($this->markedItems[$typeName]),
-                               'items' => array()
-                       );
-                       
                        $typeData = array();
                        if (isset($containerData[$typeName])) {
                                $typeData = $containerData[$typeName];