Fixed WCFSetup

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 1400f62cf4fd7235248f3ce260588bf8f5eceef5..6472603f37a82330a0e891f24807133ce2d197f3 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -363,7 +363,7 @@ WCF.ACP.Package.Installation = Class.extend({
         * Initializes the package installation.
         */
        _init: function() {
-               $('#submitButton').click($.proxy(this._prepareInstallation, this));
+               $('#submitButton').click($.proxy(this.prepareInstallation, this));
        },
        
        /**
@@ -383,7 +383,7 @@ WCF.ACP.Package.Installation = Class.extend({
        /**
         * Prepares installation dialog.
         */
-       _prepareInstallation: function() {
+       prepareInstallation: function() {
                WCF.showAJAXDialog('packageInstallationDialog', true, {
                        ajax: true,
                        closable: false,
@@ -462,7 +462,7 @@ WCF.ACP.Package.Installation = Class.extend({
                        var self = this;
                        $('#packageInstallationInnerContent').html(data.innerTemplate).find('input').keyup(function(event) {
                                if (event.keyCode === 13) { // Enter
-                                       self._submitDialog(data);
+                                       self._submit(data);
                                }
                        });
                        
@@ -497,7 +497,7 @@ WCF.ACP.Package.Installation = Class.extend({
         * 
         * @param       object          data
         */
-       _submitDialog: function(data) {
+       _submit: function(data) {
                // collect form values
                var $additionalData = {};
                $('#packageInstallationInnerContent input').each(function(index, inputElement) {
@@ -607,7 +607,7 @@ WCF.ACP.Package.Uninstallation = WCF.ACP.Package.Installation.extend({
                WCF.System.Confirmation.show($element.data('confirmMessage'), function(action) {
                        if (action === 'confirm') {
                                self._packageID = $element.data('objectID');
-                               self._prepareInstallation();
+                               self.prepareInstallation();
                        }
                });
        },

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
index 435ba871c016e103e8e16328c1688ceacd791108..6fd157edd270d9c5dea4461193a44bb0fe60679a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
@@ -5,7 +5,7 @@
        $(function() {
                WCF.Language.add('wcf.acp.package.installation.title', '{lang}wcf.acp.package.installation.title{/lang}');
 
-               var $installation = new WCF.ACP.Package.Installation('install', {@$queueID}, false);
+               var $installation = new WCF.ACP.Package.Installation({@$queueID});
                $installation.prepareInstallation();
        });
        //]]>