From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 10 Nov 2010 12:58:22 +0000 (+0000)
Subject: Disable forward/back when installer is disabled
X-Git-Tag: 1.31.0-rc.0~33948
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=4610d247c52a2a951c9047b89abaeda25f15ab99;p=lhc%2Fweb%2Fwiklou.git

Disable forward/back when installer is disabled
---

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 5a806b3f73..2f2dc86938 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -87,7 +87,7 @@ abstract class WebInstallerPage {
 		return str_replace( 'WebInstaller_', '', get_class( $this ) );
 	}
 
-	public function getId() {
+	protected function getId() {
 		return array_search( $this->getName(), $this->parent->pageSequence );
 	}
 
@@ -117,7 +117,6 @@ abstract class WebInstallerPage {
 }
 
 class WebInstaller_Locked extends WebInstallerPage {
-
 	// The status of Installer::getLocalSettingsStatus()
 	private $status;
 
@@ -125,6 +124,10 @@ class WebInstaller_Locked extends WebInstallerPage {
 		$this->status = $s;
 	}
 
+	protected function getId() {
+		return 0;
+	}
+
 	public function execute() {
 		$r = $this->parent->request;
 		if( !$r->wasPosted() || !$this->status->isOK() ) {
@@ -157,7 +160,7 @@ class WebInstaller_Locked extends WebInstallerPage {
 				) )
 			);
 		}
-		$this->endForm();
+		$this->endForm( false );
 	}
 }