From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 7 Dec 2012 18:38:58 +0000 (+0100)
Subject: Dropped support for 4-level language categories
X-Git-Tag: 2.0.0_Beta_1~728^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f9100ba21f1f3b0313ae09cb268cbc239b28cc1;p=GitHub%2FWoltLab%2FWCF.git

Dropped support for 4-level language categories

A valid category is now: foo.bar and foo.bar.baz, everything else will be ignored. If your using a language category with 4 levels, it won't be loaded. EVER. Deal with it :)
---

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 641e336bd4..06117f0c38 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -965,8 +965,7 @@ WCF.ACP.Options.Group = Class.extend({
  * @param	string		className
  * @param	object		options
  */
-WCF.ACP.Worker = function(dialogID, className, options) { this.init(dialogID, className, options); };
-WCF.ACP.Worker.prototype = {
+WCF.ACP.Worker = Class.extend({
 	/**
 	 * dialog id
 	 * @var	string
@@ -1046,7 +1045,7 @@ WCF.ACP.Worker.prototype = {
 			this._dialog.wcfDialog('render');
 		}
 	}
-};
+});
 
 /**
  * Namespace for category-related functions.
diff --git a/wcfsetup/install/files/lib/data/language/Language.class.php b/wcfsetup/install/files/lib/data/language/Language.class.php
index 367084c8d9..4387c3126a 100644
--- a/wcfsetup/install/files/lib/data/language/Language.class.php
+++ b/wcfsetup/install/files/lib/data/language/Language.class.php
@@ -91,10 +91,7 @@ class Language extends DatabaseObject {
 				return $item;
 			}
 			
-			// attempt to load all categories beginning with the most specific
-			if (isset($explodedItem[4])) {
-				$this->loadCategory($explodedItem[0].'.'.$explodedItem[1].'.'.$explodedItem[2].'.'.$explodedItem[3]);
-			}
+			// attempt to load the most specific category
 			if (isset($explodedItem[3])) {
 				$this->loadCategory($explodedItem[0].'.'.$explodedItem[1].'.'.$explodedItem[2]);
 			}