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 641e336bd47a55c3fc62bc6d7cebcf8d0bda6eee..06117f0c3827628c841dcea25df1b49da51f955c 100644 (file)
--- 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 367084c8d9674e85544e54b178e75417293f2d43..4387c3126a24ed6edfaa74a90dffd5ee8b86e20e 100644 (file)
--- 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]);
                        }