wikimedia/mediawiki-extensions-SpamBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamBlacklist synced 2024-11-15 03:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made getArticleText() plausibly work unlike before

Browse source 
* This could only have worked with local pages before.

Change-Id: Iebc7b77249105d896c3f3b49119ff0b5ba56f204
This commit is contained in:
Aaron Schulz 2015-07-28 14:20:19 -07:00
parent 2402b2d54b
commit 47f14e51c3
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
BaseBlacklist.php
View file

@ -327,33 +327,35 @@ abstract class BaseBlacklist {
* Fetch an article from this or another local MediaWiki database.
* This is probably *very* fragile, and shouldn't be used perhaps.
*
* @param string $db
* @param string $wiki
* @param string $article
* @return string
*/
function getArticleText( $db, $article ) {
wfDebugLog( 'SpamBlacklist', "Fetching {$this->getBlacklistType()} spam blacklist from '$article' on '$db'...\n" );
global $wgDBname;
$dbr = wfGetDB( DB_READ );
$dbr->selectDB( $db );
$text = false;
if ( $dbr->tableExists( 'page' ) ) {
// 1.5 schema
$dbw = wfGetDB( DB_READ );
$dbw->selectDB( $db );
$revision = Revision::newFromTitle( Title::newFromText( $article ) );
if ( $revision ) {
$text = $revision->getText();
}
$dbw->selectDB( $wgDBname );
} else {
// 1.4 schema
$title = Title::newFromText( $article );
$text = $dbr->selectField( 'cur', 'cur_text', array( 'cur_namespace' => $title->getNamespace(),
'cur_title' => $title->getDBkey() ), __METHOD__ );
}
$dbr->selectDB( $wgDBname );
return strval( $text );
function getArticleText( $wiki, $article ) {
wfDebugLog( 'SpamBlacklist',
"Fetching {$this->getBlacklistType()} blacklist from '$article' on '$wiki'...\n" );
$title = Title::newFromText( $article );
// Load all the relevant tables from the correct DB.
// This assumes that old_text is the actual text or
// that the external store system is at least unified.
$row = wfGetDB( DB_SLAVE, array(), $wiki )->selectRow(
array( 'page', 'revision', 'text' ),
array_merge(
Revision::selectFields(),
Revision::selectPageFields(),
Revision::selectTextFields()
),
array(
'page_namespace' => $title->getNamespace(), // assume NS IDs match
'page_title' => $title->getDBkey(), // assume same case rules
'rev_id=page_latest',
'old_id=rev_text_id'
),
__METHOD__
);
return $row ? Revision::newFromRow( $row )->getText() : false;
}
/**