diocloid/LinkTitles
1
0
Fork 0
mirror of https://github.com/diocloid/LinkTitles.git synced 2025-07-13 09:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use underscores when searching the page table, not spaces

Browse Source 
The old code replaced underscores with spaces, which was backwards.
Also we don't need to look for underscores or spaces in namespaces,
because they are all integers.
This commit is contained in:
Brent Laabs
2016-12-27 19:07:38 -08:00
parent 7394da4c67
commit 500d441b4b
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
includes/LinkTitles_Extension.php
View File

@ -35,7 +35,7 @@ class Extension {
/// A Title object for the target page currently being examined. /// A Title object for the target page currently being examined.
private static $targetTitle; private static $targetTitle;
// The TitleValue object of the target page // The TitleValue object of the target page
private static $targetTitleValue; private static $targetTitleValue;
@ -55,7 +55,7 @@ class Extension {
private static $wordStartDelim; private static $wordStartDelim;
private static $wordEndDelim; private static $wordEndDelim;
public static $ltConsoleOutput; public static $ltConsoleOutput;
public static $ltConsoleOutputDebug; public static $ltConsoleOutputDebug;
@ -130,16 +130,16 @@ class Extension {
// Build a blacklist of pages that are not supposed to be link // Build a blacklist of pages that are not supposed to be link
// targets. This includes the current page. // targets. This includes the current page.
$blackList = str_replace( '_', ' ', $blackList = str_replace( ' ', '_',
'("' . implode( '", "',$wgLinkTitlesBlackList ) . '", "' . '("' . implode( '","',$wgLinkTitlesBlackList ) . '","' .
addslashes( self::$currentTitle->getDbKey() ) . '")' ); addslashes( self::$currentTitle->getDbKey() ) . '")' );
$currentNamespace[] = $title->getNamespace(); $currentNamespace[] = $title->getNamespace();
// Build our weight list. Make sure current namespace is first element // Build our weight list. Make sure current namespace is first element
$namespaces = array_diff($wgLinkTitlesNamespaces, $currentNamespace); $namespaces = array_diff($wgLinkTitlesNamespaces, $currentNamespace);
array_unshift($namespaces, $currentNamespace[0] ); array_unshift($namespaces, $currentNamespace[0] );
// No need for sanitiy check. we are sure that we have at least one element in the array // No need for sanitiy check. we are sure that we have at least one element in the array
$weightSelect = "CASE page_namespace "; $weightSelect = "CASE page_namespace ";
$currentWeight = 0; $currentWeight = 0;
@ -148,7 +148,7 @@ class Extension {
$weightSelect = $weightSelect . " WHEN " . $namspacevalue . " THEN " . $currentWeight . PHP_EOL; $weightSelect = $weightSelect . " WHEN " . $namspacevalue . " THEN " . $currentWeight . PHP_EOL;
} }
$weightSelect = $weightSelect . " END "; $weightSelect = $weightSelect . " END ";
$namespacesClause = str_replace( '_', ' ','(' . implode( ', ',$namespaces ) . ')' ); $namespacesClause = '(' . implode( ', ', $namespaces ) . ')';
// Build an SQL query and fetch all page titles ordered by length from // Build an SQL query and fetch all page titles ordered by length from
// shortest to longest. Only titles from 'normal' pages (namespace uid // shortest to longest. Only titles from 'normal' pages (namespace uid
@ -194,7 +194,7 @@ class Extension {
// regexp compilation errors // regexp compilation errors
self::$targetTitleText = self::$targetTitle->getText(); self::$targetTitleText = self::$targetTitle->getText();
$quotedTitle = preg_quote(self::$targetTitleText, '/'); $quotedTitle = preg_quote(self::$targetTitleText, '/');
self::ltDebugLog('TargetTitle='. self::$targetTitleText,"private"); self::ltDebugLog('TargetTitle='. self::$targetTitleText,"private");
self::ltDebugLog('TargetTitleQuoted='. $quotedTitle,"private"); self::ltDebugLog('TargetTitleQuoted='. $quotedTitle,"private");
@ -243,7 +243,7 @@ class Extension {
}; // foreach $res as $row }; // foreach $res as $row
return $newText; return $newText;
} }
/// Automatically processes a single page, given a $title Title object. /// Automatically processes a single page, given a $title Title object.
/// This function is called by the SpecialLinkTitles class and the /// This function is called by the SpecialLinkTitles class and the
/// LinkTitlesJob class. /// LinkTitlesJob class.
@ -349,9 +349,9 @@ class Extension {
/// Sets member variables for the current target page. /// Sets member variables for the current target page.
private static function newTarget( $ns, $title ) { private static function newTarget( $ns, $title ) {
self::$targetTitle = \Title::makeTitleSafe( $ns, $title ); self::$targetTitle = \Title::makeTitleSafe( $ns, $title );
self::ltDebugLog( 'newtarget='. self::$targetTitle->getText(), "private" ); self::ltDebugLog( 'newtarget='. self::$targetTitle->getText(), "private" );
self::$targetTitleValue = self::$targetTitle->getTitleValue(); self::$targetTitleValue = self::$targetTitle->getTitleValue();
self::ltDebugLog( 'altTarget='. self::$targetTitleValue->getText(), "private" ); self::ltDebugLog( 'altTarget='. self::$targetTitleValue->getText(), "private" );
self::$targetContent = null; self::$targetContent = null;
} }
@ -477,6 +477,6 @@ private static function BuildDelimiters() {
} }
wfDebugLog('LinkTitles', $text , 'private'); wfDebugLog('LinkTitles', $text , 'private');
} }
} }
// vim: ts=2:sw=2:noet:comments^=\:/// // vim: ts=2:sw=2:noet:comments^=\:///