| Index: branches/REL1_18/phase3/includes/db/Database.php |
| — | — | @@ -1883,6 +1883,12 @@ |
| 1884 | 1884 | } |
| 1885 | 1885 | $prefix = $this->mTablePrefix; # Default prefix |
| 1886 | 1886 | |
| | 1887 | + # A database name has been specified in input. We don't want any |
| | 1888 | + # prefixes added. |
| | 1889 | + if ( isset( $database ) ) { |
| | 1890 | + $prefix = ''; |
| | 1891 | + } |
| | 1892 | + |
| 1887 | 1893 | # Note that we use the long format because php will complain in in_array if |
| 1888 | 1894 | # the input is not an array, and will complain in is_array if it is not set. |
| 1889 | 1895 | if ( !isset( $database ) # Don't use shared database if pre selected. |
| — | — | @@ -1898,7 +1904,6 @@ |
| 1899 | 1905 | # Quote the $database and $table and apply the prefix if not quoted. |
| 1900 | 1906 | if ( isset( $database ) ) { |
| 1901 | 1907 | $database = ( !$quoted || $this->isQuotedIdentifier( $database ) ? $database : $this->addIdentifierQuotes( $database ) ); |
| 1902 | | - $prefix = ''; |
| 1903 | 1908 | } |
| 1904 | 1909 | |
| 1905 | 1910 | $table = "{$prefix}{$table}"; |
| Property changes on: branches/REL1_18/phase3/includes/db/Database.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1906 | 1911 | Merged /trunk/phase3/includes/db/Database.php:r92551-92552,92560,92563-92564,92568,92570,92573-92574,92576,92581,93103 |