Replaces data.returnValues.actionName with data.actionName
authorMatthias Schmidt <gravatronics@live.com>
Wed, 9 Jan 2013 12:23:33 +0000 (13:23 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 9 Jan 2013 12:23:33 +0000 (13:23 +0100)
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/lib/data/style/StyleAction.class.php

index 7e22e90c9b167ec7b67e056fca303f1d15316a0d..a8cf99063a1376329cf55553bf5cc6d569ee2b9d 100755 (executable)
@@ -1145,7 +1145,7 @@ WCF.Clipboard = {
                        
                        var $containerID = $container.wcfIdentify();
                        WCF.CloseOverlayHandler.removeCallback($containerID);
-
+                       
                        $container.empty();
                });
                
@@ -7165,7 +7165,7 @@ WCF.Style.Chooser = Class.extend({
         * @param       jQuery          jqXHR
         */
        _success: function(data, textStatus, jqXHR) {
-               if (data.returnValues.actionName === 'changeStyle') {
+               if (data.actionName === 'changeStyle') {
                        window.location.reload();
                        return;
                }
index 95ea77d55a4f46f62a94ce2f8a4b395cf10591a9..5e78120176b42912472a8b3de1e3a48f32d749b4 100644 (file)
@@ -480,10 +480,6 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction
                if (StyleHandler::getInstance()->getStyle()->styleID == $this->style->styleID) {
                        WCF::getSession()->setStyleID($this->style->styleID);
                }
-               
-               return array(
-                       'actionName' => 'changeStyle'
-               );
        }
        
        /**