Index: trunk/phase3/includes/Article.php |
— | — | @@ -112,7 +112,7 @@ |
113 | 113 | array( |
114 | 114 | 'rd_from' => $this->getID(), |
115 | 115 | 'rd_namespace' => $retval->getNamespace(), |
116 | | - 'rd_title' => $retval->getDBKey() |
| 116 | + 'rd_title' => $retval->getDBkey() |
117 | 117 | ), |
118 | 118 | __METHOD__ |
119 | 119 | ); |
— | — | @@ -2619,7 +2619,7 @@ |
2620 | 2620 | $dbw->delete( 'recentchanges', |
2621 | 2621 | array( 'rc_type != '.RC_LOG, |
2622 | 2622 | 'rc_namespace' => $this->mTitle->getNamespace(), |
2623 | | - 'rc_title' => $this->mTitle->getDBKey() ), |
| 2623 | + 'rc_title' => $this->mTitle->getDBkey() ), |
2624 | 2624 | __METHOD__ ); |
2625 | 2625 | $dbw->delete( 'recentchanges', |
2626 | 2626 | array( 'rc_type != '.RC_LOG, 'rc_cur_id' => $id ), |
Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
— | — | @@ -175,7 +175,7 @@ |
176 | 176 | if( !is_null( $title ) ) { |
177 | 177 | # Convert NS_MEDIA -> NS_FILE |
178 | 178 | if( $title->getNamespace() == NS_MEDIA ) { |
179 | | - $title = Title::makeTitle( NS_FILE, $title->getDBKey() ); |
| 179 | + $title = Title::makeTitle( NS_FILE, $title->getDBkey() ); |
180 | 180 | } |
181 | 181 | if( !is_null( $arg ) ) { |
182 | 182 | $text = $title->$func( $arg ); |
Index: trunk/phase3/includes/filerepo/LocalFile.php |
— | — | @@ -642,7 +642,7 @@ |
643 | 643 | $fields = OldLocalFile::selectFields(); |
644 | 644 | $conds = $opts = $join_conds = array(); |
645 | 645 | $eq = $inc ? "=" : ""; |
646 | | - $conds[] = "oi_name = " . $dbr->addQuotes( $this->title->getDBKey() ); |
| 646 | + $conds[] = "oi_name = " . $dbr->addQuotes( $this->title->getDBkey() ); |
647 | 647 | if( $start ) { |
648 | 648 | $conds[] = "oi_timestamp <$eq " . $dbr->addQuotes( $dbr->timestamp( $start ) ); |
649 | 649 | } |
— | — | @@ -1796,7 +1796,7 @@ |
1797 | 1797 | $this->file = $file; |
1798 | 1798 | $this->target = $target; |
1799 | 1799 | $this->oldHash = $this->file->repo->getHashPath( $this->file->getName() ); |
1800 | | - $this->newHash = $this->file->repo->getHashPath( $this->target->getDBKey() ); |
| 1800 | + $this->newHash = $this->file->repo->getHashPath( $this->target->getDBkey() ); |
1801 | 1801 | $this->oldName = $this->file->getName(); |
1802 | 1802 | $this->newName = $this->file->repo->getNameFromTitle( $this->target ); |
1803 | 1803 | $this->oldRel = $this->oldHash . $this->oldName; |
Index: trunk/phase3/includes/filerepo/LocalRepo.php |
— | — | @@ -127,7 +127,7 @@ |
128 | 128 | 'page_id', //Field |
129 | 129 | array( //Conditions |
130 | 130 | 'page_namespace' => $title->getNamespace(), |
131 | | - 'page_title' => $title->getDBKey(), |
| 131 | + 'page_title' => $title->getDBkey(), |
132 | 132 | ), |
133 | 133 | __METHOD__ //Function name |
134 | 134 | ); |
Index: trunk/phase3/includes/api/ApiQueryBacklinks.php |
— | — | @@ -110,7 +110,7 @@ |
111 | 111 | else |
112 | 112 | $this->addFields($resultPageSet->getPageTableFields()); |
113 | 113 | $this->addFields('page_is_redirect'); |
114 | | - $this->addWhereFld($this->bl_title, $this->rootTitle->getDBKey()); |
| 114 | + $this->addWhereFld($this->bl_title, $this->rootTitle->getDBkey()); |
115 | 115 | if($this->hasNS) |
116 | 116 | $this->addWhereFld($this->bl_ns, $this->rootTitle->getNamespace()); |
117 | 117 | $this->addWhereFld('page_namespace', $this->params['namespace']); |
— | — | @@ -143,14 +143,14 @@ |
144 | 144 | // We can't use LinkBatch here because $this->hasNS may be false |
145 | 145 | $titleWhere = array(); |
146 | 146 | foreach($this->redirTitles as $t) |
147 | | - $titleWhere[] = "{$this->bl_title} = ".$db->addQuotes($t->getDBKey()). |
| 147 | + $titleWhere[] = "{$this->bl_title} = ".$db->addQuotes($t->getDBkey()). |
148 | 148 | ($this->hasNS ? " AND {$this->bl_ns} = '{$t->getNamespace()}'" : ""); |
149 | 149 | $this->addWhere($db->makeList($titleWhere, LIST_OR)); |
150 | 150 | $this->addWhereFld('page_namespace', $this->params['namespace']); |
151 | 151 | if(!is_null($this->redirID)) |
152 | 152 | { |
153 | 153 | $first = $this->redirTitles[0]; |
154 | | - $title = $db->strencode($first->getDBKey()); |
| 154 | + $title = $db->strencode($first->getDBkey()); |
155 | 155 | $ns = $first->getNamespace(); |
156 | 156 | $from = $this->redirID; |
157 | 157 | if($this->hasNS) |
Index: trunk/phase3/includes/api/ApiQueryCategoryInfo.php |
— | — | @@ -53,7 +53,7 @@ |
54 | 54 | foreach($categories as $c) |
55 | 55 | { |
56 | 56 | $t = $titles[$c]; |
57 | | - $cattitles[$c] = $t->getDBKey(); |
| 57 | + $cattitles[$c] = $t->getDBkey(); |
58 | 58 | } |
59 | 59 | |
60 | 60 | $this->addTables(array('category', 'page', 'page_props')); |
Index: trunk/phase3/includes/api/ApiQueryInfo.php |
— | — | @@ -301,10 +301,10 @@ |
302 | 302 | $this->protections[$title->getNamespace()][$title->getDBkey()]; |
303 | 303 | $this->getResult()->setIndexedTagName($pageInfo['protection'], 'pr'); |
304 | 304 | } |
305 | | - if($this->fld_talkid && isset($this->talkids[$title->getNamespace()][$title->getDBKey()])) |
306 | | - $pageInfo['talkid'] = $this->talkids[$title->getNamespace()][$title->getDBKey()]; |
307 | | - if($this->fld_subjectid && isset($this->subjectids[$title->getNamespace()][$title->getDBKey()])) |
308 | | - $pageInfo['subjectid'] = $this->subjectids[$title->getNamespace()][$title->getDBKey()]; |
| 305 | + if($this->fld_talkid && isset($this->talkids[$title->getNamespace()][$title->getDBkey()])) |
| 306 | + $pageInfo['talkid'] = $this->talkids[$title->getNamespace()][$title->getDBkey()]; |
| 307 | + if($this->fld_subjectid && isset($this->subjectids[$title->getNamespace()][$title->getDBkey()])) |
| 308 | + $pageInfo['subjectid'] = $this->subjectids[$title->getNamespace()][$title->getDBkey()]; |
309 | 309 | if($this->fld_url) { |
310 | 310 | $pageInfo['fullurl'] = $title->getFullURL(); |
311 | 311 | $pageInfo['editurl'] = $title->getFullURL('action=edit'); |
— | — | @@ -404,7 +404,7 @@ |
405 | 405 | $images = $others = array(); |
406 | 406 | foreach ($this->everything as $title) |
407 | 407 | if ($title->getNamespace() == NS_FILE) |
408 | | - $images[] = $title->getDBKey(); |
| 408 | + $images[] = $title->getDBkey(); |
409 | 409 | else |
410 | 410 | $others[] = $title; |
411 | 411 | |
Index: trunk/phase3/includes/Title.php |
— | — | @@ -2599,7 +2599,7 @@ |
2600 | 2600 | if( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) { |
2601 | 2601 | $errors[] = array('imageinvalidfilename'); |
2602 | 2602 | } |
2603 | | - if( !File::checkExtensionCompatibility( $file, $nt->getDBKey() ) ) { |
| 2603 | + if( !File::checkExtensionCompatibility( $file, $nt->getDBkey() ) ) { |
2604 | 2604 | $errors[] = array('imagetypemismatch'); |
2605 | 2605 | } |
2606 | 2606 | } |
— | — | @@ -3018,8 +3018,8 @@ |
3019 | 3019 | // don't move it twice |
3020 | 3020 | continue; |
3021 | 3021 | $newPageName = preg_replace( |
3022 | | - '#^'.preg_quote( $this->getDBKey(), '#' ).'#', |
3023 | | - $nt->getDBKey(), $oldSubpage->getDBKey() ); |
| 3022 | + '#^'.preg_quote( $this->getDBkey(), '#' ).'#', |
| 3023 | + $nt->getDBkey(), $oldSubpage->getDBkey() ); |
3024 | 3024 | if( $oldSubpage->isTalkPage() ) { |
3025 | 3025 | $newNs = $nt->getTalkPage()->getNamespace(); |
3026 | 3026 | } else { |
— | — | @@ -3381,7 +3381,7 @@ |
3382 | 3382 | case NS_FILE: |
3383 | 3383 | return wfFindFile( $this ); // file exists, possibly in a foreign repo |
3384 | 3384 | case NS_SPECIAL: |
3385 | | - return SpecialPage::exists( $this->getDBKey() ); // valid special page |
| 3385 | + return SpecialPage::exists( $this->getDBkey() ); // valid special page |
3386 | 3386 | case NS_MAIN: |
3387 | 3387 | return $this->mDbkeyform == ''; // selflink, possibly with fragment |
3388 | 3388 | case NS_MEDIAWIKI: |
Index: trunk/phase3/includes/specials/SpecialAllpages.php |
— | — | @@ -125,8 +125,8 @@ |
126 | 126 | |
127 | 127 | $from = Title::makeTitleSafe( $namespace, $from ); |
128 | 128 | $to = Title::makeTitleSafe( $namespace, $to ); |
129 | | - $from = ( $from && $from->isLocal() ) ? $from->getDBKey() : null; |
130 | | - $to = ( $to && $to->isLocal() ) ? $to->getDBKey() : null; |
| 129 | + $from = ( $from && $from->isLocal() ) ? $from->getDBkey() : null; |
| 130 | + $to = ( $to && $to->isLocal() ) ? $to->getDBkey() : null; |
131 | 131 | |
132 | 132 | if( isset($from) ) |
133 | 133 | $where[] = 'page_title >= '.$dbr->addQuotes( $from ); |
Index: trunk/phase3/includes/specials/SpecialExport.php |
— | — | @@ -389,7 +389,7 @@ |
390 | 390 | array_merge( $join, |
391 | 391 | array( |
392 | 392 | 'page_namespace' => $title->getNamespace(), |
393 | | - 'page_title' => $title->getDBKey() ) ), |
| 393 | + 'page_title' => $title->getDBkey() ) ), |
394 | 394 | __METHOD__ ); |
395 | 395 | foreach( $result as $row ) { |
396 | 396 | $template = Title::makeTitle( $row->namespace, $row->title ); |
Index: trunk/phase3/includes/specials/SpecialFileDuplicateSearch.php |
— | — | @@ -73,7 +73,7 @@ |
74 | 74 | if( $title && $title->getText() != '' ) { |
75 | 75 | $dbr = wfGetDB( DB_SLAVE ); |
76 | 76 | $image = $dbr->tableName( 'image' ); |
77 | | - $encFilename = $dbr->addQuotes( htmlspecialchars( $title->getDBKey() ) ); |
| 77 | + $encFilename = $dbr->addQuotes( htmlspecialchars( $title->getDBkey() ) ); |
78 | 78 | $sql = "SELECT img_sha1 from $image where img_name = $encFilename"; |
79 | 79 | $res = $dbr->query( $sql ); |
80 | 80 | $row = $dbr->fetchRow( $res ); |
Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
— | — | @@ -69,7 +69,7 @@ |
70 | 70 | return $this->tryShowFile( $this->file ); |
71 | 71 | } |
72 | 72 | # Logs must have a type given |
73 | | - if( $this->logids && !strpos($this->page->getDBKey(),'/') ) { |
| 73 | + if( $this->logids && !strpos($this->page->getDBkey(),'/') ) { |
74 | 74 | return $wgOut->showErrorPage( 'revdelete-nologtype-title', 'revdelete-nologtype-text' ); |
75 | 75 | } |
76 | 76 | # Give a link to the logs/hist for this page |
— | — | @@ -270,7 +270,7 @@ |
271 | 271 | $result = $dbr->select( 'archive', '*', |
272 | 272 | array( |
273 | 273 | 'ar_namespace' => $this->page->getNamespace(), |
274 | | - 'ar_title' => $this->page->getDBKey(), |
| 274 | + 'ar_title' => $this->page->getDBkey(), |
275 | 275 | 'ar_timestamp' => $where |
276 | 276 | ), |
277 | 277 | __METHOD__ |
— | — | @@ -372,11 +372,11 @@ |
373 | 373 | if( $this->deleteKey == 'oldimage' ) { |
374 | 374 | // Run through and pull all our data in one query |
375 | 375 | foreach( $this->ofiles as $timestamp ) { |
376 | | - $where[] = $timestamp.'!'.$this->page->getDBKey(); |
| 376 | + $where[] = $timestamp.'!'.$this->page->getDBkey(); |
377 | 377 | } |
378 | 378 | $result = $dbr->select( 'oldimage', '*', |
379 | 379 | array( |
380 | | - 'oi_name' => $this->page->getDBKey(), |
| 380 | + 'oi_name' => $this->page->getDBkey(), |
381 | 381 | 'oi_archive_name' => $where |
382 | 382 | ), |
383 | 383 | __METHOD__ |
— | — | @@ -388,7 +388,7 @@ |
389 | 389 | } |
390 | 390 | // Check through our images |
391 | 391 | foreach( $this->ofiles as $timestamp ) { |
392 | | - $archivename = $timestamp.'!'.$this->page->getDBKey(); |
| 392 | + $archivename = $timestamp.'!'.$this->page->getDBkey(); |
393 | 393 | if( !isset($filesObjs[$archivename]) ) { |
394 | 394 | continue; |
395 | 395 | } else if( !$filesObjs[$archivename]->userCan(File::DELETED_RESTRICTED) ) { |
— | — | @@ -411,7 +411,7 @@ |
412 | 412 | } |
413 | 413 | $result = $dbr->select( 'filearchive', '*', |
414 | 414 | array( |
415 | | - 'fa_name' => $this->page->getDBKey(), |
| 415 | + 'fa_name' => $this->page->getDBkey(), |
416 | 416 | 'fa_id' => $where |
417 | 417 | ), |
418 | 418 | __METHOD__ |
— | — | @@ -501,7 +501,7 @@ |
502 | 502 | foreach( $this->events as $logid ) { |
503 | 503 | $where[] = intval($logid); |
504 | 504 | } |
505 | | - list($log,$logtype) = explode( '/',$this->page->getDBKey(), 2 ); |
| 505 | + list($log,$logtype) = explode( '/',$this->page->getDBkey(), 2 ); |
506 | 506 | $result = $dbr->select( 'logging', '*', |
507 | 507 | array( 'log_type' => $logtype, 'log_id' => $where ), |
508 | 508 | __METHOD__ |
— | — | @@ -960,7 +960,7 @@ |
961 | 961 | $result = $this->dbw->select( 'archive', '*', |
962 | 962 | array( |
963 | 963 | 'ar_namespace' => $title->getNamespace(), |
964 | | - 'ar_title' => $title->getDBKey(), |
| 964 | + 'ar_title' => $title->getDBkey(), |
965 | 965 | 'ar_timestamp' => $where |
966 | 966 | ), __METHOD__ |
967 | 967 | ); |
— | — | @@ -1026,10 +1026,10 @@ |
1027 | 1027 | $set = array(); |
1028 | 1028 | // Run through and pull all our data in one query |
1029 | 1029 | foreach( $items as $timestamp ) { |
1030 | | - $where[] = $timestamp.'!'.$title->getDBKey(); |
| 1030 | + $where[] = $timestamp.'!'.$title->getDBkey(); |
1031 | 1031 | } |
1032 | 1032 | $result = $this->dbw->select( 'oldimage', '*', |
1033 | | - array( 'oi_name' => $title->getDBKey(), 'oi_archive_name' => $where ), |
| 1033 | + array( 'oi_name' => $title->getDBkey(), 'oi_archive_name' => $where ), |
1034 | 1034 | __METHOD__ |
1035 | 1035 | ); |
1036 | 1036 | while( $row = $this->dbw->fetchObject( $result ) ) { |
— | — | @@ -1039,7 +1039,7 @@ |
1040 | 1040 | } |
1041 | 1041 | // To work! |
1042 | 1042 | foreach( $items as $timestamp ) { |
1043 | | - $archivename = $timestamp.'!'.$title->getDBKey(); |
| 1043 | + $archivename = $timestamp.'!'.$title->getDBkey(); |
1044 | 1044 | if( !isset($filesObjs[$archivename]) ) { |
1045 | 1045 | $success = false; |
1046 | 1046 | continue; // Must exist |
— | — | @@ -1121,7 +1121,7 @@ |
1122 | 1122 | $where[] = intval($id); |
1123 | 1123 | } |
1124 | 1124 | $result = $this->dbw->select( 'filearchive', '*', |
1125 | | - array( 'fa_name' => $title->getDBKey(), |
| 1125 | + array( 'fa_name' => $title->getDBkey(), |
1126 | 1126 | 'fa_id' => $where ), |
1127 | 1127 | __METHOD__ ); |
1128 | 1128 | while( $row = $this->dbw->fetchObject( $result ) ) { |
— | — | @@ -1175,7 +1175,7 @@ |
1176 | 1176 | foreach( $items as $logid ) { |
1177 | 1177 | $where[] = intval($logid); |
1178 | 1178 | } |
1179 | | - list($log,$logtype) = explode( '/',$title->getDBKey(), 2 ); |
| 1179 | + list($log,$logtype) = explode( '/',$title->getDBkey(), 2 ); |
1180 | 1180 | $result = $this->dbw->select( 'logging', '*', |
1181 | 1181 | array( 'log_type' => $logtype, 'log_id' => $where ), |
1182 | 1182 | __METHOD__ |
— | — | @@ -1348,7 +1348,7 @@ |
1349 | 1349 | $this->dbw->update( 'archive', |
1350 | 1350 | array( 'ar_deleted' => $bitfield ), |
1351 | 1351 | array( 'ar_namespace' => $title->getNamespace(), |
1352 | | - 'ar_title' => $title->getDBKey(), |
| 1352 | + 'ar_title' => $title->getDBkey(), |
1353 | 1353 | // use timestamp for index |
1354 | 1354 | 'ar_timestamp' => $this->dbw->timestamp( $rev->getTimestamp() ), |
1355 | 1355 | 'ar_rev_id' => $rev->getId() |
Index: trunk/phase3/includes/specials/SpecialBlockip.php |
— | — | @@ -527,7 +527,7 @@ |
528 | 528 | $delAction = LogPage::DELETED_ACTION | Revision::DELETED_RESTRICTED; |
529 | 529 | # Normalize user name |
530 | 530 | $userTitle = Title::makeTitleSafe( NS_USER, $name ); |
531 | | - $userDbKey = $userTitle->getDBKey(); |
| 531 | + $userDbKey = $userTitle->getDBkey(); |
532 | 532 | # To suppress, we OR the current bitfields with Revision::DELETED_USER |
533 | 533 | # to put a 1 in the username *_deleted bit. To unsuppress we AND the |
534 | 534 | # current bitfields with the inverse of Revision::DELETED_USER. The |
Index: trunk/phase3/includes/specials/SpecialMovepage.php |
— | — | @@ -422,7 +422,7 @@ |
423 | 423 | } elseif( $this->moveTalk ) { |
424 | 424 | $conds = array( |
425 | 425 | 'page_namespace' => $ot->getTalkPage()->getNamespace(), |
426 | | - 'page_title' => $ot->getDBKey() |
| 426 | + 'page_title' => $ot->getDBkey() |
427 | 427 | ); |
428 | 428 | } else { |
429 | 429 | # Skip the query |
— | — | @@ -450,9 +450,9 @@ |
451 | 451 | } |
452 | 452 | |
453 | 453 | $newPageName = preg_replace( |
454 | | - '#^'.preg_quote( $ot->getDBKey(), '#' ).'#', |
455 | | - $nt->getDBKey(), |
456 | | - $oldSubpage->getDBKey() |
| 454 | + '#^'.preg_quote( $ot->getDBkey(), '#' ).'#', |
| 455 | + $nt->getDBkey(), |
| 456 | + $oldSubpage->getDBkey() |
457 | 457 | ); |
458 | 458 | if( $oldSubpage->isTalkPage() ) { |
459 | 459 | $newNs = $nt->getTalkPage()->getNamespace(); |
Index: trunk/phase3/includes/specials/SpecialListUserRestrictions.php |
— | — | @@ -73,7 +73,7 @@ |
74 | 74 | $title = Title::newFromText( $page ); |
75 | 75 | if( $title ) { |
76 | 76 | $conds['ur_page_namespace'] = $title->getNamespace(); |
77 | | - $conds['ur_page_title'] = $title->getDBKey(); |
| 77 | + $conds['ur_page_title'] = $title->getDBkey(); |
78 | 78 | } |
79 | 79 | |
80 | 80 | return $conds; |
Index: trunk/phase3/includes/LogPage.php |
— | — | @@ -332,7 +332,7 @@ |
333 | 333 | break; |
334 | 334 | default: |
335 | 335 | if( $title->getNamespace() == NS_SPECIAL ) { |
336 | | - list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBKey() ); |
| 336 | + list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() ); |
337 | 337 | # Use the language name for log titles, rather than Log/X |
338 | 338 | if( $name == 'Log' ) { |
339 | 339 | $titleLink = '('.$skin->link( $title, LogPage::logName( $par ) ).')'; |
Index: trunk/phase3/includes/Category.php |
— | — | @@ -26,7 +26,7 @@ |
27 | 27 | */ |
28 | 28 | protected function initialize() { |
29 | 29 | if ( $this->mName === null && $this->mTitle ) |
30 | | - $this->mName = $title->getDBKey(); |
| 30 | + $this->mName = $title->getDBkey(); |
31 | 31 | |
32 | 32 | if( $this->mName === null && $this->mID === null ) { |
33 | 33 | throw new MWException( __METHOD__.' has both names and IDs null' ); |
— | — | @@ -50,7 +50,7 @@ |
51 | 51 | if ( $this->mTitle ) { |
52 | 52 | # If there is a title object but no record in the category table, treat this as an empty category |
53 | 53 | $this->mID = false; |
54 | | - $this->mName = $this->mTitle->getDBKey(); |
| 54 | + $this->mName = $this->mTitle->getDBkey(); |
55 | 55 | $this->mPages = 0; |
56 | 56 | $this->mSubcats = 0; |
57 | 57 | $this->mFiles = 0; |
— | — | @@ -91,7 +91,7 @@ |
92 | 92 | } |
93 | 93 | |
94 | 94 | $cat->mTitle = $title; |
95 | | - $cat->mName = $title->getDBKey(); |
| 95 | + $cat->mName = $title->getDBkey(); |
96 | 96 | |
97 | 97 | return $cat; |
98 | 98 | } |
— | — | @@ -106,7 +106,7 @@ |
107 | 107 | $cat = new self(); |
108 | 108 | |
109 | 109 | $cat->mTitle = $title; |
110 | | - $cat->mName = $title->getDBKey(); |
| 110 | + $cat->mName = $title->getDBkey(); |
111 | 111 | |
112 | 112 | return $cat; |
113 | 113 | } |
— | — | @@ -149,7 +149,7 @@ |
150 | 150 | # but we can't know that here... |
151 | 151 | return false; |
152 | 152 | } else { |
153 | | - $cat->mName = $title->getDBKey(); # if we have a title object, fetch the category name from there |
| 153 | + $cat->mName = $title->getDBkey(); # if we have a title object, fetch the category name from there |
154 | 154 | } |
155 | 155 | |
156 | 156 | $cat->mID = false; |