| Index: branches/iwtransclusion/phase3/maintenance/tables.sql |
| — | — | @@ -1071,8 +1071,8 @@ |
| 1072 | 1072 | -- The URL of the file api.php |
| 1073 | 1073 | iw_api blob NOT NULL, |
| 1074 | 1074 | |
| 1075 | | - -- The name of the database (for a connection to be established with wfGetLB( 'dbname' )) |
| 1076 | | - iw_dbname varchar(32) NOT NULL, |
| | 1075 | + -- The name of the database (for a connection to be established with wfGetLB( 'wikiid' )) |
| | 1076 | + iw_wikiid varchar(64) NOT NULL, |
| 1077 | 1077 | |
| 1078 | 1078 | -- A boolean value indicating whether the wiki is in this project |
| 1079 | 1079 | -- (used, for example, to detect redirect loops) |
| Index: branches/iwtransclusion/phase3/includes/Interwiki.php |
| — | — | @@ -17,11 +17,11 @@ |
| 18 | 18 | |
| 19 | 19 | protected $mPrefix, $mURL, $mAPI, $mLocal, $mTrans; |
| 20 | 20 | |
| 21 | | - public function __construct( $prefix = null, $url = '', $api = '', $dbname = '', $local = 0, $trans = 0 ) { |
| | 21 | + public function __construct( $prefix = null, $url = '', $api = '', $wikiid = '', $local = 0, $trans = 0 ) { |
| 22 | 22 | $this->mPrefix = $prefix; |
| 23 | 23 | $this->mURL = $url; |
| 24 | 24 | $this->mAPI = $api; |
| 25 | | - $this->mDBname = $dbname; |
| | 25 | + $this->mWikiID = $wikiid; |
| 26 | 26 | $this->mLocal = $local; |
| 27 | 27 | $this->mTrans = $trans; |
| 28 | 28 | } |
| — | — | @@ -170,12 +170,12 @@ |
| 171 | 171 | * @return Boolean: whether everything was there |
| 172 | 172 | */ |
| 173 | 173 | protected static function loadFromArray( $mc ) { |
| 174 | | - if( isset( $mc['iw_url'] ) && isset( $mc['iw_api'] ) && isset( $mc['iw_dbname'] ) |
| | 174 | + if( isset( $mc['iw_url'] ) && isset( $mc['iw_api'] ) && isset( $mc['iw_wikiid'] ) |
| 175 | 175 | && isset( $mc['iw_local'] ) && isset( $mc['iw_trans'] ) ) { |
| 176 | 176 | $iw = new Interwiki(); |
| 177 | 177 | $iw->mURL = $mc['iw_url']; |
| 178 | 178 | $iw->mAPI = $mc['iw_api']; |
| 179 | | - $iw->mDBname = $mc['iw_dbname']; |
| | 179 | + $iw->mWikiID = $mc['iw_wikiid']; |
| 180 | 180 | $iw->mLocal = $mc['iw_local']; |
| 181 | 181 | $iw->mTrans = $mc['iw_trans']; |
| 182 | 182 | return $iw; |
| — | — | @@ -211,8 +211,8 @@ |
| 212 | 212 | * |
| 213 | 213 | * @return String: the DB name |
| 214 | 214 | */ |
| 215 | | - public function getDBname( ) { |
| 216 | | - return $this->mDBname; |
| | 215 | + public function getWikiID( ) { |
| | 216 | + return $this->mWikiID; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
| Index: branches/iwtransclusion/phase3/includes/parser/Parser.php |
| — | — | @@ -3430,7 +3430,7 @@ |
| 3431 | 3431 | |
| 3432 | 3432 | } |
| 3433 | 3433 | |
| 3434 | | - return "<h2>$fullTitle</h2><pre>$text</pre> List of templates: <pre>".$listSubTemplates.'</pre>' . $list2; |
| | 3434 | + return "<h2>$fullTitle</h2><pre>$url1\n$url2\n$text</pre> List of templates: <pre>".$listSubTemplates.'</pre>' . $list2; |
| 3435 | 3435 | } |
| 3436 | 3436 | |
| 3437 | 3437 | |
| Index: branches/iwtransclusion/phase3/includes/Title.php |
| — | — | @@ -533,11 +533,11 @@ |
| 534 | 534 | * |
| 535 | 535 | * @return \type{\string} the DB name |
| 536 | 536 | */ |
| 537 | | - public function getTransDBname() { |
| | 537 | + public function getTransWikiID() { |
| 538 | 538 | if ( $this->mInterwiki == '' ) |
| 539 | 539 | return false; |
| 540 | 540 | |
| 541 | | - return Interwiki::fetch( $this->mInterwiki )->getDBname(); |
| | 541 | + return Interwiki::fetch( $this->mInterwiki )->getWikiID(); |
| 542 | 542 | } |
| 543 | 543 | |
| 544 | 544 | /** |