From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 30 Jun 2010 03:36:20 +0000 (+0000)
Subject: * Removed mockup code from WebInstallerPage::execute(), made it abstract instead.
X-Git-Tag: 1.31.0-rc.0~36340
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=270751a123eef55a50cfbc3f2fb12b1361bd9cc4;p=lhc%2Fweb%2Fwiklou.git

* Removed mockup code from WebInstallerPage::execute(), made it abstract instead.
* Updated URL for session.save_path documentation.
* Fixed documentation typo.
---

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index aae9aadb43..ca3ccf38f9 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -7,7 +7,7 @@ class LocalSettingsGenerator {
 	private $installer;
 
 	/**
-	 * Construtor.
+	 * Constructor.
 	 * @param $installer Installer subclass
 	 */
 	public function __construct( Installer $installer ) {
@@ -263,4 +263,4 @@ if ( \$wgCommandLineMode ) {
 \$wgCacheEpoch = max( \$wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );
 ";
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 547bf66fc5..4d16e2d5c2 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -238,7 +238,7 @@ class WebInstaller extends Installer {
 	/**
 	 * Get the value of session.save_path
 	 *
-	 * Per http://www.php.net/manual/en/ref.session.php#ini.session.save-path,
+	 * Per http://www.php.net/manual/en/session.configuration.php#ini.session.save-path,
 	 * this might have some additional preceding parts which need to be
 	 * ditched
 	 *
@@ -803,7 +803,7 @@ class WebInstaller extends Installer {
 	}
 }
 
-class WebInstallerPage {
+abstract class WebInstallerPage {
 	function __construct( $parent ) {
 		$this->parent = $parent;
 	}
@@ -863,15 +863,7 @@ class WebInstallerPage {
 		return array_search( $this->getName(), $this->parent->pageSequence );
 	}
 
-	function execute() {
-		if ( $this->parent->request->wasPosted() ) {
-			return 'continue';
-		} else {
-			$this->startForm();
-			$this->addHTML( 'Mockup' );
-			$this->endForm();
-		}
-	}
+	abstract function execute();
 
 	function getVar( $var ) {
 		return $this->parent->getVar( $var );