From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Wed, 7 Jul 2010 10:55:53 +0000 (+0000)
Subject: new-installer: WebInstaller's ->finish method needs to be public, not private
X-Git-Tag: 1.31.0-rc.0~36228
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=a1837b2526eed3f8218b87988ad8c708a8b31448;p=lhc%2Fweb%2Fwiklou.git

new-installer: WebInstaller's ->finish method needs to be public, not private

It's called from new-index.php if we can't start a session:

    $installer = new WebInstaller( $wgRequest );

    if ( !$installer->startSession() ) {
    	$installer->finish();

Resulting in:

    [07-Jul-2010 10:37:00] PHP Fatal error:  Call to private method WebInstaller::finish() from context '' in /home/avar/g/phase3/config/new-index.php on line 12
---

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 5fde97534f..9a5b664e27 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -278,7 +278,7 @@ class WebInstaller extends Installer {
 	/**
 	 * Clean up from execute()
 	 */
-	private function finish() {
+	public function finish() {
 		$this->output->output();
 		$this->session['happyPages'] = $this->happyPages;
 		$this->session['skippedPages'] = $this->skippedPages;