Forgot param 1, make URL param 2 per Nikerabbit

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 6588e51..7e826ff 100644 (file)
--- 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</li>\n",
+Please read [$2 these instructions] or ask on #postgresql on irc.freenode.net</li>\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 faac6ce..a557918 100644 (file)
--- 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 ) {