| Index: branches/REL1_17/phase3/includes/installer/Installer.php |
| — | — | @@ -624,9 +624,8 @@ |
| 625 | 625 | $this->setVar( '_CompiledDBs', $compiledDBs ); |
| 626 | 626 | |
| 627 | 627 | if ( !$compiledDBs ) { |
| 628 | | - $this->showError( 'config-no-db' ); |
| | 628 | + $this->showError( 'config-no-db', $wgLang->commaList( $allNames ) ); |
| 629 | 629 | // FIXME: this only works for the web installer! |
| 630 | | - $this->showHelpBox( 'config-no-db-help', $wgLang->commaList( $allNames ) ); |
| 631 | 630 | return false; |
| 632 | 631 | } |
| 633 | 632 | |
| Property changes on: branches/REL1_17/phase3/includes/installer/Installer.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 634 | 633 | Merged /trunk/phase3/includes/installer/Installer.php:r87222 |
| Index: branches/REL1_17/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -97,8 +97,7 @@ |
| 98 | 98 | If you run a high-traffic site, you should read a little on [http://www.mediawiki.org/wiki/Unicode_normalization_considerations Unicode normalization].", |
| 99 | 99 | 'config-unicode-update-warning' => "'''Warning''': The installed version of the Unicode normalization wrapper uses an older version of [http://site.icu-project.org/ the ICU project's] library. |
| 100 | 100 | You should [http://www.mediawiki.org/wiki/Unicode_normalization_considerations upgrade] if you are at all concerned about using Unicode.", |
| 101 | | - 'config-no-db' => 'Could not find a suitable database driver!', |
| 102 | | - 'config-no-db-help' => 'You need to install a database driver for PHP. |
| | 101 | + 'config-no-db' => 'Could not find a suitable database driver! You need to install a database driver for PHP. |
| 103 | 102 | The following database types are supported: $1. |
| 104 | 103 | |
| 105 | 104 | If you are on shared hosting, ask your hosting provider to install a suitable database driver. |
| Property changes on: branches/REL1_17/phase3/includes/installer/Installer.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 106 | 105 | Merged /trunk/phase3/includes/installer/Installer.i18n.php:r87222 |