From: Chad Horohoe Date: Fri, 7 Jan 2011 18:41:55 +0000 (+0000) Subject: Forgot param 1, make URL param 2 per Nikerabbit X-Git-Tag: 1.31.0-rc.0~32716 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=3848fdfd1565c66e5ed5599762b97421380ec15c;p=lhc%2Fweb%2Fwiklou.git Forgot param 1, make URL param 2 per Nikerabbit --- diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php index 6588e51b35..7e826ff427 100644 --- a/includes/installer/Installer.i18n.php +++ b/includes/installer/Installer.i18n.php @@ -454,7 +454,7 @@ Make sure that the user "$1" can write to the schema "$2".', 'config-pg-no-plpgsql' => 'You need to install the language PL/pgSQL in the database $1', 'config-install-pg-ts2' => 'Checking for tsearch2', 'config-install-pg-ts2-failed' => "'''FAILED''' tsearch2 must be installed in the database $1 -Please read [http://www.devx.com/opensource/Article/21674/0/page/2 these instructions] or ask on #postgresql on irc.freenode.net\n", +Please read [$2 these instructions] or ask on #postgresql on irc.freenode.net\n", 'config-install-user' => 'Creating database user', 'config-install-user-failed' => 'Granting permission to user "$1" failed: $2', 'config-install-tables' => 'Creating tables', diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index faac6cefa1..a5579188e9 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -196,7 +196,11 @@ class PostgresInstaller extends DatabaseInstaller { function setupTs2() { if( version_compare( $this->db->getServerVersion(), $this->ts2MaxVersion, '<' ) ) { if ( !$this->db->tableExists( 'pg_ts_cfg', $wgDBts2schema ) ) { - return Status::newFatal( 'config-install-pg-ts2-failed' ); + return Status::newFatal( + 'config-install-pg-ts2-failed', + $this->getVar( 'wgDBname' ), + 'http://www.devx.com/opensource/Article/21674/0/page/2' + ); } $safeuser = $this->db->addQuotes( $this->getVar( 'wgDBuser' ) ); foreach ( array( 'cfg', 'cfgmap', 'dict', 'parser' ) as $table ) {