From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 5 Mar 2012 18:57:24 +0000 (+0100)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1250
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5ede7e587fbb80aef54f87089ba360d69f142135;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	wcfsetup/install/files/js/WCF.js
---

5ede7e587fbb80aef54f87089ba360d69f142135
diff --cc wcfsetup/install/files/js/WCF.js
index dcf6e67ad0,5a991687d0..047a145b9f
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@@ -4221,11 -4221,9 +4221,11 @@@ WCF.Sortable.List.prototype = 
  		$('#' + this._containerID + ' .wcf-sortableList').sortable({
  			connectWith: '#' + this._containerID + ' .wcf-sortableList',
  			items: 'li',
- 			placeholder: 'wcf-sortablePlaceholder'
+ 			placeholder: 'wcf-badgeYellow',
 -			stop: $.proxy(this._save, this)
  		});
 +		
 +		this._container.find('.wcf-formSubmit > button[data-type="submit"]').click($.proxy(this._submit, this));
 +		this._container.find('.wcf-formSubmit > button[data-type="reset"]').click($.proxy(this._reset, this));
  	},
  	
  	/**