| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -598,6 +598,7 @@ |
| 599 | 599 | $this->mErrorConnection = $conn; |
| 600 | 600 | $conn = false; |
| 601 | 601 | } else { |
| | 602 | + $conn->tablePrefix( $prefix ); |
| 602 | 603 | $this->mConns['foreignUsed'][$i][$wiki] = $conn; |
| 603 | 604 | wfDebug( __METHOD__.": opened new connection for $i/$wiki\n" ); |
| 604 | 605 | } |
| — | — | @@ -638,17 +639,12 @@ |
| 639 | 640 | $dbname = $dbNameOverride; |
| 640 | 641 | } |
| 641 | 642 | |
| 642 | | - if( !isset( $prefix ) ){ |
| 643 | | - global $wgDBprefix; |
| 644 | | - $prefix = $wgDBprefix; |
| 645 | | - } |
| 646 | | - |
| 647 | 643 | # Get class for this database type |
| 648 | 644 | $class = 'Database' . ucfirst( $type ); |
| 649 | 645 | |
| 650 | 646 | # Create object |
| 651 | 647 | wfDebug( "Connecting to $host $dbname...\n" ); |
| 652 | | - $db = new $class( $host, $user, $password, $dbname, 1, $flags, $prefix ); |
| | 648 | + $db = new $class( $host, $user, $password, $dbname, 1, $flags ); |
| 653 | 649 | if ( $db->isOpen() ) { |
| 654 | 650 | wfDebug( "Connected\n" ); |
| 655 | 651 | } else { |