Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed LinkHolderArray::makeHolder() to use Linker::link() instead of Linker::makeBrokenLinkObj() and Linker::makeColouredLinkObj()

Browse source
This commit is contained in:
Alexandre Emsenhuber 2011-03-15 16:47:55 +00:00
parent c4e3251395
commit b974497da8
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/parser/CoreLinkFunctions.php
View file

@ -41,7 +41,7 @@ class CoreLinkFunctions {
# Return false so that this link is reverted back to WikiText
return false;
}
return $holders->makeHolder( $title, isset($displayText) ? $displayText : $titleText, '', '', '' );
return $holders->makeHolder( $title, isset($displayText) ? $displayText : $titleText, array(), '', '' );
}
/**

38
includes/parser/LinkHolderArray.php
View file

@ -191,7 +191,7 @@ class LinkHolderArray {
*
* @param $nt Title
*/
function makeHolder( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
function makeHolder( $nt, $text = '', $query = array(), $trail = '', $prefix = '' ) {
wfProfileIn( __METHOD__ );
if ( ! is_object($nt) ) {
# Fail gracefully
@ -205,7 +205,7 @@ class LinkHolderArray {
'text' => $prefix.$text.$inside,
'pdbk' => $nt->getPrefixedDBkey(),
);
if ( $query !== '' ) {
if ( $query !== array() ) {
$entry['query'] = $query;
}
@ -349,23 +349,29 @@ class LinkHolderArray {
foreach ( $entries as $index => $entry ) {
$pdbk = $entry['pdbk'];
$title = $entry['title'];
$query = isset( $entry['query'] ) ? $entry['query'] : '';
$query = isset( $entry['query'] ) ? $entry['query'] : array();
$key = "$ns:$index";
$searchkey = "<!--LINK $key-->";
if ( !isset( $colours[$pdbk] ) || $colours[$pdbk] == 'new' ) {
$linkCache->addBadLinkObj( $title );
$colours[$pdbk] = 'new';
$output->addLink( $title, 0 );
// FIXME: replace deprecated makeBrokenLinkObj() by link()
$replacePairs[$searchkey] = $sk->makeBrokenLinkObj( $title,
$entry['text'],
$query );
} else {
// FIXME: replace deprecated makeColouredLinkObj() by link()
$replacePairs[$searchkey] = $sk->makeColouredLinkObj( $title, $colours[$pdbk],
$entry['text'],
$query );
$displayText = $entry['text'];
if ( $displayText === '' ) {
$displayText = null;
}
if ( !isset( $colours[$pdbk] ) ) {
$colours[$pdbk] = 'new';
}
$attribs = array();
if ( $colours[$pdbk] == 'new' ) {
$linkCache->addBadLinkObj( $title );
$output->addLink( $title, 0 );
$type = array( 'broken' );
} else {
if ( $colours[$pdbk] != '' ) {
$attribs['class'] = $colours[$pdbk];
}
$type = array( 'known', 'noclasses' );
}
$replacePairs[$searchkey] = $sk->link( $title, $displayText,
$attribs, $query, $type );
}
}
$replacer = new HashtableReplacer( $replacePairs, 1 );

4
includes/parser/Parser.php
View file

@ -1935,7 +1935,7 @@ class Parser {
$s .= $this->makeKnownLinkHolder( $nt, $text, array(), $trail, $prefix );
} else {
# Links will be added to the output link list after checking
$s .= $holders->makeHolder( $nt, $text, '', $trail, $prefix );
$s .= $holders->makeHolder( $nt, $text, array(), $trail, $prefix );
}
wfProfileOut( __METHOD__."-always_known" );
}
@ -1951,7 +1951,7 @@ class Parser {
*
* @deprecated
*/
function makeLinkHolder( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
function makeLinkHolder( &$nt, $text = '', $query = array(), $trail = '', $prefix = '' ) {
return $this->mLinkHolders->makeHolder( $nt, $text, $query, $trail, $prefix );
}