r79830 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79829‎ | r79830 | r79831 >
Date:18:41, 7 January 2011
Author:demon
Status:ok
Tags:
Comment:
Forgot param 1, make URL param 2 per Nikerabbit
Modified paths:
  • /trunk/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /trunk/phase3/includes/installer/PostgresInstaller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.i18n.php
@@ -454,7 +454,7 @@
455455 'config-pg-no-plpgsql' => 'You need to install the language PL/pgSQL in the database $1',
456456 'config-install-pg-ts2' => 'Checking for tsearch2',
457457 'config-install-pg-ts2-failed' => "'''FAILED''' tsearch2 must be installed in the database $1
458 -Please read [http://www.devx.com/opensource/Article/21674/0/page/2 these instructions] or ask on #postgresql on irc.freenode.net</li>\n",
 458+Please read [$2 these instructions] or ask on #postgresql on irc.freenode.net</li>\n",
459459 'config-install-user' => 'Creating database user',
460460 'config-install-user-failed' => 'Granting permission to user "$1" failed: $2',
461461 'config-install-tables' => 'Creating tables',
Index: trunk/phase3/includes/installer/PostgresInstaller.php
@@ -196,7 +196,11 @@
197197 function setupTs2() {
198198 if( version_compare( $this->db->getServerVersion(), $this->ts2MaxVersion, '<' ) ) {
199199 if ( !$this->db->tableExists( 'pg_ts_cfg', $wgDBts2schema ) ) {
200 - return Status::newFatal( 'config-install-pg-ts2-failed' );
 200+ return Status::newFatal(
 201+ 'config-install-pg-ts2-failed',
 202+ $this->getVar( 'wgDBname' ),
 203+ 'http://www.devx.com/opensource/Article/21674/0/page/2'
 204+ );
201205 }
202206 $safeuser = $this->db->addQuotes( $this->getVar( 'wgDBuser' ) );
203207 foreach ( array( 'cfg', 'cfgmap', 'dict', 'parser' ) as $table ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r81182MFT a bunch of installer fixes. r80238, r80128, r80124, r80083, r80080, r800...demon01:59, 29 January 2011

Status & tagging log