| Index: trunk/phase3/config/index.php |
| — | — | @@ -654,7 +654,7 @@ |
| 655 | 655 | >http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b></li>\n"; |
| 656 | 656 | } |
| 657 | 657 | $ok = true; # Let's be optimistic |
| 658 | | - |
| | 658 | + |
| 659 | 659 | # Decide if we're going to use the superuser or the regular database user |
| 660 | 660 | $conf->Root = $useRoot; |
| 661 | 661 | if( $conf->Root ) { |
| — | — | @@ -664,7 +664,7 @@ |
| 665 | 665 | $db_user = $wgDBuser; |
| 666 | 666 | $db_pass = $wgDBpassword; |
| 667 | 667 | } |
| 668 | | - |
| | 668 | + |
| 669 | 669 | # Attempt to connect |
| 670 | 670 | echo( "<li>Attempting to connect to database server as $db_user..." ); |
| 671 | 671 | $wgDatabase = Database::newFromParams( $wgDBserver, $db_user, $db_pass, '', 1 ); |
| — | — | @@ -706,7 +706,7 @@ |
| 707 | 707 | break; |
| 708 | 708 | } # switch |
| 709 | 709 | } #conn. att. |
| 710 | | - |
| | 710 | + |
| 711 | 711 | if( !$ok ) { continue; } |
| 712 | 712 | |
| 713 | 713 | } else /* not mysql */ { |
| — | — | @@ -1175,7 +1175,7 @@ |
| 1176 | 1176 | aField( $conf, "RootPW", "Superuser password:", "password" ); |
| 1177 | 1177 | ?> |
| 1178 | 1178 | </div> |
| 1179 | | - |
| | 1179 | + |
| 1180 | 1180 | <p class="config-desc"> |
| 1181 | 1181 | If the database user specified above does not exist, or does not have access to create |
| 1182 | 1182 | the database (if needed) or tables within it, please check the box and provide details |