| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -326,11 +326,11 @@ |
| 327 | 327 | if( $this->deleteKey=='oldimage' ) { |
| 328 | 328 | // Run through and pull all our data in one query |
| 329 | 329 | foreach( $this->ofiles as $timestamp ) { |
| 330 | | - $where[] = $dbr->addQuotes( $timestamp.'!'.$this->page->getDbKey() ); |
| | 330 | + $where[] = $dbr->addQuotes( $timestamp.'!'.$this->page->getDBKey() ); |
| 331 | 331 | } |
| 332 | 332 | $whereClause = 'oi_archive_name IN(' . implode(',',$where) . ')'; |
| 333 | 333 | $result = $dbr->select( 'oldimage', '*', |
| 334 | | - array( 'oi_name' => $this->page->getDbKey(), |
| | 334 | + array( 'oi_name' => $this->page->getDBKey(), |
| 335 | 335 | $whereClause ), |
| 336 | 336 | __METHOD__ ); |
| 337 | 337 | while( $row = $dbr->fetchObject( $result ) ) { |
| — | — | @@ -340,7 +340,7 @@ |
| 341 | 341 | } |
| 342 | 342 | // Check through our images |
| 343 | 343 | foreach( $this->ofiles as $timestamp ) { |
| 344 | | - $archivename = $timestamp.'!'.$this->page->getDbKey(); |
| | 344 | + $archivename = $timestamp.'!'.$this->page->getDBKey(); |
| 345 | 345 | if( !isset($filesObjs[$archivename]) ) { |
| 346 | 346 | continue; |
| 347 | 347 | } else if( !$filesObjs[$archivename]->userCan(File::DELETED_RESTRICTED) ) { |
| — | — | @@ -364,7 +364,7 @@ |
| 365 | 365 | } |
| 366 | 366 | $whereClause = 'fa_id IN(' . implode(',',$where) . ')'; |
| 367 | 367 | $result = $dbr->select( 'filearchive', '*', |
| 368 | | - array( 'fa_name' => $this->page->getDbKey(), |
| | 368 | + array( 'fa_name' => $this->page->getDBKey(), |
| 369 | 369 | $whereClause ), |
| 370 | 370 | __METHOD__ ); |
| 371 | 371 | while( $row = $dbr->fetchObject( $result ) ) { |
| — | — | @@ -939,11 +939,11 @@ |
| 940 | 940 | $set = array(); |
| 941 | 941 | // Run through and pull all our data in one query |
| 942 | 942 | foreach( $items as $timestamp ) { |
| 943 | | - $where[] = $this->dbw->addQuotes( $timestamp.'!'.$title->getDbKey() ); |
| | 943 | + $where[] = $this->dbw->addQuotes( $timestamp.'!'.$title->getDBKey() ); |
| 944 | 944 | } |
| 945 | 945 | $whereClause = 'oi_archive_name IN(' . implode(',',$where) . ')'; |
| 946 | 946 | $result = $this->dbw->select( 'oldimage', '*', |
| 947 | | - array( 'oi_name' => $title->getDbKey(), |
| | 947 | + array( 'oi_name' => $title->getDBKey(), |
| 948 | 948 | $whereClause ), |
| 949 | 949 | __METHOD__ ); |
| 950 | 950 | while( $row = $this->dbw->fetchObject( $result ) ) { |
| — | — | @@ -953,7 +953,7 @@ |
| 954 | 954 | } |
| 955 | 955 | // To work! |
| 956 | 956 | foreach( $items as $timestamp ) { |
| 957 | | - $archivename = $timestamp.'!'.$title->getDbKey(); |
| | 957 | + $archivename = $timestamp.'!'.$title->getDBKey(); |
| 958 | 958 | if( !isset($filesObjs[$archivename]) ) { |
| 959 | 959 | $success = false; |
| 960 | 960 | continue; // Must exist |
| — | — | @@ -1036,7 +1036,7 @@ |
| 1037 | 1037 | } |
| 1038 | 1038 | $whereClause = 'fa_id IN(' . implode(',',$where) . ')'; |
| 1039 | 1039 | $result = $this->dbw->select( 'filearchive', '*', |
| 1040 | | - array( 'fa_name' => $title->getDbKey(), |
| | 1040 | + array( 'fa_name' => $title->getDBKey(), |
| 1041 | 1041 | $whereClause ), |
| 1042 | 1042 | __METHOD__ ); |
| 1043 | 1043 | while( $row = $this->dbw->fetchObject( $result ) ) { |
| Index: trunk/phase3/includes/specials/SpecialListUserRestrictions.php |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | $title = Title::newFromText( $page ); |
| 74 | 74 | if( $title ) { |
| 75 | 75 | $conds['ur_page_namespace'] = $title->getNamespace(); |
| 76 | | - $conds['ur_page_title'] = $title->getDbKey(); |
| | 76 | + $conds['ur_page_title'] = $title->getDBKey(); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | return $conds; |
| Index: trunk/phase3/includes/specials/SpecialExport.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | array_merge( $join, |
| 95 | 95 | array( |
| 96 | 96 | 'page_namespace' => $title->getNamespace(), |
| 97 | | - 'page_title' => $title->getDbKey() ) ), |
| | 97 | + 'page_title' => $title->getDBKey() ) ), |
| 98 | 98 | __METHOD__ ); |
| 99 | 99 | foreach( $result as $row ) { |
| 100 | 100 | $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/api/ApiQueryLangLinks.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | $this->dieUsage("Invalid continue param. You should pass the " . |
| 60 | 60 | "original value returned by the previous query", "_badcontinue"); |
| 61 | 61 | $llfrom = intval($cont[0]); |
| 62 | | - $lllang = $this->getDb()->strencode($cont[1]); |
| | 62 | + $lllang = $this->getDB()->strencode($cont[1]); |
| 63 | 63 | $this->addWhere("ll_from > $llfrom OR ". |
| 64 | 64 | "(ll_from = $llfrom AND ". |
| 65 | 65 | "ll_lang >= '$lllang')"); |
| Index: trunk/phase3/includes/api/ApiQueryCategories.php |
| — | — | @@ -87,7 +87,7 @@ |
| 88 | 88 | $this->dieUsage("Invalid continue param. You should pass the " . |
| 89 | 89 | "original value returned by the previous query", "_badcontinue"); |
| 90 | 90 | $clfrom = intval($cont[0]); |
| 91 | | - $clto = $this->getDb()->strencode($this->titleToKey($cont[1])); |
| | 91 | + $clto = $this->getDB()->strencode($this->titleToKey($cont[1])); |
| 92 | 92 | $this->addWhere("cl_from > $clfrom OR ". |
| 93 | 93 | "(cl_from = $clfrom AND ". |
| 94 | 94 | "cl_to >= '$clto')"); |
| Index: trunk/phase3/includes/api/ApiQueryCategoryInfo.php |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | foreach($categories as $c) |
| 54 | 54 | { |
| 55 | 55 | $t = $titles[$c]; |
| 56 | | - $cattitles[$c] = $t->getDbKey(); |
| | 56 | + $cattitles[$c] = $t->getDBKey(); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $this->addTables('category'); |
| Index: trunk/phase3/includes/api/ApiQueryImages.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | $this->dieUsage("Invalid continue param. You should pass the " . |
| 68 | 68 | "original value returned by the previous query", "_badcontinue"); |
| 69 | 69 | $ilfrom = intval($cont[0]); |
| 70 | | - $ilto = $this->getDb()->strencode($this->titleToKey($cont[1])); |
| | 70 | + $ilto = $this->getDB()->strencode($this->titleToKey($cont[1])); |
| 71 | 71 | $this->addWhere("il_from > $ilfrom OR ". |
| 72 | 72 | "(il_from = $ilfrom AND ". |
| 73 | 73 | "il_to >= '$ilto')"); |
| Index: trunk/phase3/includes/api/ApiQueryUserContributions.php |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | $this->addWhereFld('rev_deleted', 0); |
| 158 | 158 | // We only want pages by the specified users. |
| 159 | 159 | if($this->prefixMode) |
| 160 | | - $this->addWhere("rev_user_text LIKE '" . $this->getDb()->escapeLike($this->userprefix) . "%'"); |
| | 160 | + $this->addWhere("rev_user_text LIKE '" . $this->getDB()->escapeLike($this->userprefix) . "%'"); |
| 161 | 161 | else |
| 162 | 162 | $this->addWhereFld('rev_user_text', $this->usernames); |
| 163 | 163 | // ... and in the specified timeframe. |
| Index: trunk/phase3/includes/api/ApiQueryUsers.php |
| — | — | @@ -71,7 +71,7 @@ |
| 72 | 72 | if(!count($goodNames)) |
| 73 | 73 | return $retval; |
| 74 | 74 | |
| 75 | | - $db = $this->getDb(); |
| | 75 | + $db = $this->getDB(); |
| 76 | 76 | $this->addTables('user', 'u1'); |
| 77 | 77 | $this->addFields('u1.user_name'); |
| 78 | 78 | $this->addWhereFld('u1.user_name', $goodNames); |
| Index: trunk/phase3/includes/api/ApiQueryRecentChanges.php |
| — | — | @@ -112,10 +112,10 @@ |
| 113 | 113 | // LinkBatch refuses these, but we need them anyway |
| 114 | 114 | if(!array_key_exists($obj->getNamespace(), $lb->data)) |
| 115 | 115 | $lb->data[$obj->getNamespace()] = array(); |
| 116 | | - $lb->data[$obj->getNamespace()][$obj->getDbKey()] = 1; |
| | 116 | + $lb->data[$obj->getNamespace()][$obj->getDBKey()] = 1; |
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | | - $where = $lb->constructSet('rc', $this->getDb()); |
| | 119 | + $where = $lb->constructSet('rc', $this->getDB()); |
| 120 | 120 | if($where != '') |
| 121 | 121 | $this->addWhere($where); |
| 122 | 122 | } |
| Index: trunk/phase3/includes/api/ApiQueryLinks.php |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | "original value returned by the previous query", "_badcontinue"); |
| 94 | 94 | $plfrom = intval($cont[0]); |
| 95 | 95 | $plns = intval($cont[1]); |
| 96 | | - $pltitle = $this->getDb()->strencode($this->titleToKey($cont[2])); |
| | 96 | + $pltitle = $this->getDB()->strencode($this->titleToKey($cont[2])); |
| 97 | 97 | $this->addWhere("{$this->prefix}_from > $plfrom OR ". |
| 98 | 98 | "({$this->prefix}_from = $plfrom AND ". |
| 99 | 99 | "({$this->prefix}_namespace > $plns OR ". |
| Index: trunk/phase3/includes/api/ApiQueryExtLinksUsage.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | else |
| 68 | 68 | $protocol = null; |
| 69 | 69 | |
| 70 | | - $db = $this->getDb(); |
| | 70 | + $db = $this->getDB(); |
| 71 | 71 | $this->addTables(array('page','externallinks')); // must be in this order for 'USE INDEX' |
| 72 | 72 | $this->addOption('USE INDEX', 'el_index'); |
| 73 | 73 | $this->addWhere('page_id=el_from'); |
| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -296,7 +296,7 @@ |
| 297 | 297 | $others = array(); |
| 298 | 298 | foreach ($missing as $title) |
| 299 | 299 | if ($title->getNamespace() == NS_IMAGE) |
| 300 | | - $images[] = $title->getDbKey(); |
| | 300 | + $images[] = $title->getDBKey(); |
| 301 | 301 | else |
| 302 | 302 | $others[] = $title; |
| 303 | 303 | |
| — | — | @@ -449,10 +449,10 @@ |
| 450 | 450 | $result->setIndexedTagName($pageInfo['protection'], 'pr'); |
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | | - if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDbKey()])) |
| 454 | | - $pageInfo['talkid'] = $talkids[$title->getNamespace()][$title->getDbKey()]; |
| 455 | | - if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDbKey()])) |
| 456 | | - $pageInfo['subjectid'] = $subjectids[$title->getNamespace()][$title->getDbKey()]; |
| | 453 | + if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDBKey()])) |
| | 454 | + $pageInfo['talkid'] = $talkids[$title->getNamespace()][$title->getDBKey()]; |
| | 455 | + if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDBKey()])) |
| | 456 | + $pageInfo['subjectid'] = $subjectids[$title->getNamespace()][$title->getDBKey()]; |
| 457 | 457 | if($fld_url) { |
| 458 | 458 | $pageInfo['fullurl'] = $title->getFullURL(); |
| 459 | 459 | $pageInfo['editurl'] = $title->getFullURL('action=edit'); |
| — | — | @@ -496,10 +496,10 @@ |
| 497 | 497 | $res['query']['pages'][$pageid]['protection'] = array(); |
| 498 | 498 | $result->setIndexedTagName($res['query']['pages'][$pageid]['protection'], 'pr'); |
| 499 | 499 | } |
| 500 | | - if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDbKey()])) |
| 501 | | - $res['query']['pages'][$pageid]['talkid'] = $talkids[$title->getNamespace()][$title->getDbKey()]; |
| 502 | | - if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDbKey()])) |
| 503 | | - $res['query']['pages'][$pageid]['subjectid'] = $subjectids[$title->getNamespace()][$title->getDbKey()]; |
| | 500 | + if($fld_talkid && isset($talkids[$title->getNamespace()][$title->getDBKey()])) |
| | 501 | + $res['query']['pages'][$pageid]['talkid'] = $talkids[$title->getNamespace()][$title->getDBKey()]; |
| | 502 | + if($fld_subjectid && isset($subjectids[$title->getNamespace()][$title->getDBKey()])) |
| | 503 | + $res['query']['pages'][$pageid]['subjectid'] = $subjectids[$title->getNamespace()][$title->getDBKey()]; |
| 504 | 504 | if($fld_url) { |
| 505 | 505 | $res['query']['pages'][$pageid]['fullurl'] = $title->getFullURL(); |
| 506 | 506 | $res['query']['pages'][$pageid]['editurl'] = $title->getFullURL('action=edit'); |
| Index: trunk/phase3/includes/api/ApiQueryBacklinks.php |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | * AND pl_title='Foo' AND pl_namespace=0 |
| 102 | 102 | * LIMIT 11 ORDER BY pl_from |
| 103 | 103 | */ |
| 104 | | - $db = $this->getDb(); |
| | 104 | + $db = $this->getDB(); |
| 105 | 105 | $this->addTables(array('page', $this->bl_table)); |
| 106 | 106 | $this->addWhere("{$this->bl_from}=page_id"); |
| 107 | 107 | if(is_null($resultPageSet)) |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | else |
| 110 | 110 | $this->addFields($resultPageSet->getPageTableFields()); |
| 111 | 111 | $this->addFields('page_is_redirect'); |
| 112 | | - $this->addWhereFld($this->bl_title, $this->rootTitle->getDbKey()); |
| | 112 | + $this->addWhereFld($this->bl_title, $this->rootTitle->getDBKey()); |
| 113 | 113 | if($this->hasNS) |
| 114 | 114 | $this->addWhereFld($this->bl_ns, $this->rootTitle->getNamespace()); |
| 115 | 115 | $this->addWhereFld('page_namespace', $this->params['namespace']); |
| — | — | @@ -128,7 +128,7 @@ |
| 129 | 129 | * AND (pl_title='Foo' AND pl_namespace=0) OR (pl_title='Bar' AND pl_namespace=1) |
| 130 | 130 | * LIMIT 11 ORDER BY pl_namespace, pl_title, pl_from |
| 131 | 131 | */ |
| 132 | | - $db = $this->getDb(); |
| | 132 | + $db = $this->getDB(); |
| 133 | 133 | $this->addTables(array('page', $this->bl_table)); |
| 134 | 134 | $this->addWhere("{$this->bl_from}=page_id"); |
| 135 | 135 | if(is_null($resultPageSet)) |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | wfProfileIn( __METHOD__ . '-checkPageExistence' ); |
| 193 | 193 | if( !in_array( 'known', $options ) and !in_array( 'broken', $options ) ) { |
| 194 | 194 | if( $target->getNamespace() == NS_SPECIAL ) { |
| 195 | | - if( SpecialPage::exists( $target->getDbKey() ) ) { |
| | 195 | + if( SpecialPage::exists( $target->getDBKey() ) ) { |
| 196 | 196 | $options []= 'known'; |
| 197 | 197 | } else { |
| 198 | 198 | $options []= 'broken'; |
| Index: trunk/phase3/includes/filerepo/LocalFile.php |
| — | — | @@ -1716,7 +1716,7 @@ |
| 1717 | 1717 | $this->file = $file; |
| 1718 | 1718 | $this->target = $target; |
| 1719 | 1719 | $this->oldHash = $this->file->repo->getHashPath( $this->file->getName() ); |
| 1720 | | - $this->newHash = $this->file->repo->getHashPath( $this->target->getDbKey() ); |
| | 1720 | + $this->newHash = $this->file->repo->getHashPath( $this->target->getDBKey() ); |
| 1721 | 1721 | $this->oldName = $this->file->getName(); |
| 1722 | 1722 | $this->newName = $this->file->repo->getNameFromTitle( $this->target ); |
| 1723 | 1723 | $this->oldRel = $this->oldHash . $this->oldName; |
| Index: trunk/phase3/includes/filerepo/LocalRepo.php |
| — | — | @@ -94,7 +94,7 @@ |
| 95 | 95 | 'page_id', //Field |
| 96 | 96 | array( //Conditions |
| 97 | 97 | 'page_namespace' => $title->getNamespace(), |
| 98 | | - 'page_title' => $title->getDbKey(), |
| | 98 | + 'page_title' => $title->getDBKey(), |
| 99 | 99 | ), |
| 100 | 100 | __METHOD__ //Function name |
| 101 | 101 | ); |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -2461,7 +2461,7 @@ |
| 2462 | 2462 | if( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) { |
| 2463 | 2463 | $errors[] = array('imageinvalidfilename'); |
| 2464 | 2464 | } |
| 2465 | | - if( !File::checkExtensionCompatibility( $file, $nt->getDbKey() ) ) { |
| | 2465 | + if( !File::checkExtensionCompatibility( $file, $nt->getDBKey() ) ) { |
| 2466 | 2466 | $errors[] = array('imagetypemismatch'); |
| 2467 | 2467 | } |
| 2468 | 2468 | } |
| Index: trunk/extensions/DPLforum/DPLforum_body.php |
| — | — | @@ -280,13 +280,13 @@ |
| 281 | 281 | for($i = 0; $i < $cats; $i++) { |
| 282 | 282 | $sSqlSelectFrom .= " INNER JOIN $categorylinks AS" . |
| 283 | 283 | " c{$n} ON page_id = c{$n}.cl_from AND c{$n}.cl_to=" . |
| 284 | | - $dbr->addQuotes( $aCategories[$i]->getDbKey() ); |
| | 284 | + $dbr->addQuotes( $aCategories[$i]->getDBKey() ); |
| 285 | 285 | $n++; |
| 286 | 286 | } |
| 287 | 287 | for($i = 0; $i < $nocats; $i++) { |
| 288 | 288 | $sSqlSelectFrom .= " LEFT OUTER JOIN $categorylinks AS" . |
| 289 | 289 | " c{$n} ON page_id = c{$n}.cl_from AND c{$n}.cl_to=" . |
| 290 | | - $dbr->addQuotes( $aExcludeCategories[$i]->getDbKey() ); |
| | 290 | + $dbr->addQuotes( $aExcludeCategories[$i]->getDBKey() ); |
| 291 | 291 | $sSqlWhere .= " AND c{$n}.cl_to IS NULL"; |
| 292 | 292 | $n++; |
| 293 | 293 | } |
| Index: trunk/extensions/AbuseFilter/SpecialAbuseLog.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | $searchTitle = Title::newFromText( $this->mSearchTitle ); |
| 86 | 86 | if ($this->mSearchTitle && $searchTitle) { |
| 87 | 87 | $conds['afl_namespace'] = $searchTitle->getNamespace(); |
| 88 | | - $conds['afl_title'] = $searchTitle->getDbKey(); |
| | 88 | + $conds['afl_title'] = $searchTitle->getDBKey(); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | $pager = new AbuseLogPager( $this, $conds ); |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | $log_entries = array(); |
| 147 | 147 | $log_template = array( 'afl_user' => $wgUser->getId(), 'afl_user_text' => $wgUser->getName(), |
| 148 | 148 | 'afl_var_dump' => serialize( $vars ), 'afl_timestamp' => $dbr->timestamp(wfTimestampNow()), |
| 149 | | - 'afl_namespace' => $title->getNamespace(), 'afl_title' => $title->getDbKey(), 'afl_ip' => wfGetIp() ); |
| | 149 | + 'afl_namespace' => $title->getNamespace(), 'afl_title' => $title->getDBKey(), 'afl_ip' => wfGetIp() ); |
| 150 | 150 | $doneActionsByFilter = array(); |
| 151 | 151 | $filter_matched = array(); |
| 152 | 152 | |
| Index: trunk/extensions/SocialProfile/UserStats/UserStatsClass.php |
| — | — | @@ -261,7 +261,7 @@ |
| 262 | 262 | $ctg = "Opinions by User " . ($this->user_name); |
| 263 | 263 | $parser = new Parser(); |
| 264 | 264 | $CtgTitle = Title::newFromText( $parser->transformMsg(trim($ctg), $wgOut->parserOptions() ) ); |
| 265 | | - $CtgTitle = $CtgTitle->getDbKey(); |
| | 265 | + $CtgTitle = $CtgTitle->getDBKey(); |
| 266 | 266 | $dbr = wfGetDB( DB_MASTER ); |
| 267 | 267 | $sql = "UPDATE ".$wgDBprefix."user_stats SET stats_opinions_created="; |
| 268 | 268 | $sql .= "(SELECT count(*) AS CreatedOpinions FROM {$dbr->tableName( 'page' )} INNER JOIN {$dbr->tableName( 'categorylinks' )} ON page_id = cl_from WHERE (cl_to) = " . $dbr->addQuotes($CtgTitle) . " "; |
| — | — | @@ -280,7 +280,7 @@ |
| 281 | 281 | $dbr = wfGetDB( DB_MASTER ); |
| 282 | 282 | $ctg = "Opinions by User " . ($this->user_name); |
| 283 | 283 | $CtgTitle = Title::newFromText( $parser->transformMsg(trim($ctg), $wgOut->parserOptions()) ); |
| 284 | | - $CtgTitle = $CtgTitle->getDbKey(); |
| | 284 | + $CtgTitle = $CtgTitle->getDBKey(); |
| 285 | 285 | $sql = "UPDATE ".$wgDBprefix."user_stats SET stats_opinions_published = "; |
| 286 | 286 | $sql .= "(SELECT count(*) AS PromotedOpinions FROM {$dbr->tableName( 'page' )} INNER JOIN {$dbr->tableName( 'categorylinks' )} ON page_id = cl_from INNER JOIN published_page ON page_id=published_page_id WHERE (cl_to) = " . $dbr->addQuotes($CtgTitle) . " AND published_type=1 " . " " . $timeSQL; |
| 287 | 287 | $sql .= ")"; |
| Index: trunk/extensions/FCKeditor/FCKeditorSkin.body.php |
| — | — | @@ -308,7 +308,7 @@ |
| 309 | 309 | $class = 'internal'; |
| 310 | 310 | } else { |
| 311 | 311 | $upload = SpecialPage::getTitleFor( 'Upload' ); |
| 312 | | - $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $title->getDbKey() ) ); |
| | 312 | + $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $title->getDBKey() ) ); |
| 313 | 313 | $class = 'new'; |
| 314 | 314 | } |
| 315 | 315 | } |
| Index: trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php |
| — | — | @@ -243,7 +243,7 @@ |
| 244 | 244 | // Others will take Image:Foo.jpg or Foo.jpg |
| 245 | 245 | $title = Title::newFromText( $arg, NS_IMAGE ); |
| 246 | 246 | if( $title && $title->getNamespace() == NS_IMAGE ) { |
| 247 | | - return $title->getDbKey(); |
| | 247 | + return $title->getDBKey(); |
| 248 | 248 | } |
| 249 | 249 | return false; |
| 250 | 250 | } |
| Index: trunk/extensions/DynamicPageList/DynamicPageList2.php |
| — | — | @@ -1402,12 +1402,12 @@ |
| 1403 | 1403 | $sParamList = explode('|',self::getSubcategories(substr($sParam,1),$sPageTable)); |
| 1404 | 1404 | foreach ($sParamList as $sPar) { |
| 1405 | 1405 | $title = Title::newFromText($localParser->transformMsg($sPar, $pOptions)); |
| 1406 | | - if( !is_null($title) ) $aCategories[] = $title->getDbKey(); |
| | 1406 | + if( !is_null($title) ) $aCategories[] = $title->getDBKey(); |
| 1407 | 1407 | } |
| 1408 | 1408 | } |
| 1409 | 1409 | else { |
| 1410 | 1410 | $title = Title::newFromText($localParser->transformMsg($sParam, $pOptions)); |
| 1411 | | - if( !is_null($title) ) $aCategories[] = $title->getDbKey(); |
| | 1411 | + if( !is_null($title) ) $aCategories[] = $title->getDBKey(); |
| 1412 | 1412 | } |
| 1413 | 1413 | } |
| 1414 | 1414 | } |
| — | — | @@ -1440,7 +1440,7 @@ |
| 1441 | 1441 | case 'notcategory': |
| 1442 | 1442 | $title = Title::newFromText($localParser->transformMsg($sArg, $pOptions)); |
| 1443 | 1443 | if( !is_null($title) ) { |
| 1444 | | - $aExcludeCategories[] = $title->getDbKey(); |
| | 1444 | + $aExcludeCategories[] = $title->getDBKey(); |
| 1445 | 1445 | $bConflictsWithOpenReferences=true; |
| 1446 | 1446 | } |
| 1447 | 1447 | break; |
| — | — | @@ -2478,8 +2478,8 @@ |
| 2479 | 2479 | foreach ($aLinksTo as $link) { |
| 2480 | 2480 | if ($n>0) $sSqlCond_page_pl .= ' OR '; |
| 2481 | 2481 | $sSqlCond_page_pl .= '(pl.pl_namespace=' . intval( $link->getNamespace() ); |
| 2482 | | - if ($bIgnoreCase) $sSqlCond_page_pl .= " AND UPPER(pl.pl_title)=UPPER(" . $dbr->addQuotes( $link->getDbKey() ).'))'; |
| 2483 | | - else $sSqlCond_page_pl .= " AND pl.pl_title=" . $dbr->addQuotes( $link->getDbKey() ).')'; |
| | 2482 | + if ($bIgnoreCase) $sSqlCond_page_pl .= " AND UPPER(pl.pl_title)=UPPER(" . $dbr->addQuotes( $link->getDBKey() ).'))'; |
| | 2483 | + else $sSqlCond_page_pl .= " AND pl.pl_title=" . $dbr->addQuotes( $link->getDBKey() ).')'; |
| 2484 | 2484 | $n++; |
| 2485 | 2485 | } |
| 2486 | 2486 | $sSqlCond_page_pl .= ')'; |
| — | — | @@ -2492,8 +2492,8 @@ |
| 2493 | 2493 | foreach ($aNotLinksTo as $link) { |
| 2494 | 2494 | if ($n>0) $sSqlCond_page_pl .= ' OR '; |
| 2495 | 2495 | $sSqlCond_page_pl .= '('.$sPageLinksTable.'.pl_namespace=' . intval($link->getNamespace()); |
| 2496 | | - if ($bIgnoreCase) $sSqlCond_page_pl .= ' AND UPPER('.$sPageLinksTable.'.pl_title)=UPPER(' . $dbr->addQuotes( $link->getDbKey() ).'))'; |
| 2497 | | - else $sSqlCond_page_pl .= ' AND '.$sPageLinksTable.'.pl_title=' . $dbr->addQuotes( $link->getDbKey() ).')'; |
| | 2496 | + if ($bIgnoreCase) $sSqlCond_page_pl .= ' AND UPPER('.$sPageLinksTable.'.pl_title)=UPPER(' . $dbr->addQuotes( $link->getDBKey() ).'))'; |
| | 2497 | + else $sSqlCond_page_pl .= ' AND '.$sPageLinksTable.'.pl_title=' . $dbr->addQuotes( $link->getDBKey() ).')'; |
| 2498 | 2498 | $n++; |
| 2499 | 2499 | } |
| 2500 | 2500 | $sSqlCond_page_pl .= ') )'; |
| — | — | @@ -2558,8 +2558,8 @@ |
| 2559 | 2559 | $n=0; |
| 2560 | 2560 | foreach ($aImageUsed as $link) { |
| 2561 | 2561 | if ($n>0) $sSqlCond_page_pl .= ' OR '; |
| 2562 | | - if ($bIgnoreCase) $sSqlCond_page_pl .= "UPPER(il.il_to)=UPPER(" . $dbr->addQuotes( $link->getDbKey() ).')'; |
| 2563 | | - else $sSqlCond_page_pl .= "il.il_to=" . $dbr->addQuotes( $link->getDbKey() ); |
| | 2562 | + if ($bIgnoreCase) $sSqlCond_page_pl .= "UPPER(il.il_to)=UPPER(" . $dbr->addQuotes( $link->getDBKey() ).')'; |
| | 2563 | + else $sSqlCond_page_pl .= "il.il_to=" . $dbr->addQuotes( $link->getDBKey() ); |
| 2564 | 2564 | $n++; |
| 2565 | 2565 | } |
| 2566 | 2566 | $sSqlCond_page_pl .= ')'; |
| — | — | @@ -2592,8 +2592,8 @@ |
| 2593 | 2593 | foreach ($aUses as $link) { |
| 2594 | 2594 | if ($n>0) $sSqlCond_page_pl .= ' OR '; |
| 2595 | 2595 | $sSqlCond_page_pl .= '(tl.tl_namespace=' . intval( $link->getNamespace() ); |
| 2596 | | - if ($bIgnoreCase) $sSqlCond_page_pl .= " AND UPPER(tl.tl_title)=UPPER(" . $dbr->addQuotes( $link->getDbKey() ).'))'; |
| 2597 | | - else $sSqlCond_page_pl .= " AND tl.tl_title=" . $dbr->addQuotes( $link->getDbKey() ).')'; |
| | 2596 | + if ($bIgnoreCase) $sSqlCond_page_pl .= " AND UPPER(tl.tl_title)=UPPER(" . $dbr->addQuotes( $link->getDBKey() ).'))'; |
| | 2597 | + else $sSqlCond_page_pl .= " AND tl.tl_title=" . $dbr->addQuotes( $link->getDBKey() ).')'; |
| 2598 | 2598 | $n++; |
| 2599 | 2599 | } |
| 2600 | 2600 | $sSqlCond_page_pl .= ')'; |
| — | — | @@ -2606,8 +2606,8 @@ |
| 2607 | 2607 | foreach ($aNotUses as $link) { |
| 2608 | 2608 | if ($n>0) $sSqlCond_page_pl .= ' OR '; |
| 2609 | 2609 | $sSqlCond_page_pl .= '('.$sTemplateLinksTable.'.tl_namespace=' . intval($link->getNamespace()); |
| 2610 | | - if ($bIgnoreCase) $sSqlCond_page_pl .= ' AND UPPER('.$sTemplateLinksTable.'.tl_title)=UPPER(' . $dbr->addQuotes( $link->getDbKey() ).'))'; |
| 2611 | | - else $sSqlCond_page_pl .= ' AND '.$sTemplateLinksTable.'.tl_title=' . $dbr->addQuotes( $link->getDbKey() ).')'; |
| | 2610 | + if ($bIgnoreCase) $sSqlCond_page_pl .= ' AND UPPER('.$sTemplateLinksTable.'.tl_title)=UPPER(' . $dbr->addQuotes( $link->getDBKey() ).'))'; |
| | 2611 | + else $sSqlCond_page_pl .= ' AND '.$sTemplateLinksTable.'.tl_title=' . $dbr->addQuotes( $link->getDBKey() ).')'; |
| 2612 | 2612 | $n++; |
| 2613 | 2613 | } |
| 2614 | 2614 | $sSqlCond_page_pl .= ') )'; |