From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 9 Jan 2013 12:23:33 +0000 (+0100)
Subject: Replaces data.returnValues.actionName with data.actionName
X-Git-Tag: 2.0.0_Beta_1~569^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab7de4fde2c8fda1df382032f05c5cb97466d6fe;p=GitHub%2FWoltLab%2FWCF.git

Replaces data.returnValues.actionName with data.actionName
---

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 7e22e90c9b..a8cf99063a 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -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;
 		}
diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php
index 95ea77d55a..5e78120176 100644
--- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php
@@ -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'
-		);
 	}
 	
 	/**