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

diff --cc wcfsetup/install/files/acp/style/style.css
Simple merge

diff --cc wcfsetup/install/files/js/WCF.js
index ebbc4e0456ad13c26335edba67528b8ca8550e6e,64a6dee9f82ff3bf0b23bec68de99f63d4b6e592..5dce694cd3e40da356f02430eac3bc3ac7e16b68
--- 1/wcfsetup/install/files/js/WCF.js
--- 2/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@@ -3360,40 -3351,7 +3360,40 @@@ $.widget('ui.wcfDialog', 
                        this.options.success(data, textStatus, jqXHR);
                }
        },
- 
+       
 +      /**
 +       * Initializes dialog content if applicable.
 +       * 
 +       * @param       object          data
 +       */
 +      _initDialog: function(data) {
 +              // insert template
 +              data.ignoreTemplate = true;
 +              var $template = this._getResponseValue(data, 'template');
 +              if ($template !== null) {
 +                      this._content.children().html($template);
 +                      this.render();
 +              }
 +      },
 +
 +      /**
 +       * Returns a response value, taking care of different object
 +       * structure returned by AJAXProxy.
 +       * 
 +       * @param       object          data
 +       * @param       string          key
 +       */
 +      _getResponseValue: function(data, key) {
 +              if (data.returnValues && data.returnValues[key]) {
 +                      return data.returnValues[key];
 +              }
 +              else if (data[key]) {
 +                      return data[key];
 +              }
 +
 +              return null;
 +      },
 +
        /**
         * Opens this dialog.
         */