| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -542,22 +542,30 @@ |
| 543 | 543 | $wgDBconnection = ''; |
| 544 | 544 | /** Database username */ |
| 545 | 545 | $wgDBuser = 'wikiuser'; |
| 546 | | -/** Database type |
| 547 | | - */ |
| 548 | | -$wgDBtype = "mysql"; |
| | 546 | +/** Database user's password */ |
| | 547 | +$wgDBpassword = ''; |
| | 548 | +/** Database type */ |
| | 549 | +$wgDBtype = 'mysql'; |
| | 550 | + |
| 549 | 551 | /** Search type |
| 550 | 552 | * Leave as null to select the default search engine for the |
| 551 | | - * selected database type (eg SearchMySQL4), or set to a class |
| | 553 | + * selected database type (eg SearchMySQL), or set to a class |
| 552 | 554 | * name to override to a custom search engine. |
| 553 | 555 | */ |
| 554 | 556 | $wgSearchType = null; |
| | 557 | + |
| 555 | 558 | /** Table name prefix */ |
| 556 | 559 | $wgDBprefix = ''; |
| 557 | 560 | /** MySQL table options to use during installation or update */ |
| 558 | | -$wgDBTableOptions = 'ENGINE=InnoDB'; |
| | 561 | +$wgDBTableOptions = 'ENGINE=InnoDB'; |
| 559 | 562 | |
| | 563 | +/** Mediawiki schema */ |
| | 564 | +$wgDBmwschema = 'mediawiki'; |
| | 565 | +/** Tsearch2 schema */ |
| | 566 | +$wgDBts2schema = 'public'; |
| | 567 | + |
| 560 | 568 | /** To override default SQLite data directory ($docroot/../data) */ |
| 561 | | -$wgSQLiteDataDir = ''; |
| | 569 | +$wgSQLiteDataDir = ''; |
| 562 | 570 | |
| 563 | 571 | /** |
| 564 | 572 | * Make all database connections secretly go to localhost. Fool the load balancer |