Revision: 51539
Author: siebrand
Date: 2009-06-06 15:45:43 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
* replace use of deprecated makeLinkObj() by link() in core
* add FIXME where makeLinkObj was used in documentation
Modified Paths:
--------------
trunk/phase3/includes/Linker.php
trunk/phase3/includes/parser/LinkHolderArray.php
trunk/phase3/includes/parser/Parser.php
trunk/phase3/includes/specials/SpecialRevisiondelete.php
Modified: trunk/phase3/includes/Linker.php
===================================================================
--- trunk/phase3/includes/Linker.php 2009-06-06 15:39:42 UTC (rev 51538)
+++ trunk/phase3/includes/Linker.php 2009-06-06 15:45:43 UTC (rev 51539)
@@ -1669,9 +1669,19 @@
$protected = '';
}
if( $titleObj->quickUserCan( 'edit' ) ) {
- $editLink = $this->makeLinkObj(
$titleObj, wfMsg('editlink'), 'action=edit' );
+ $editLink = $this->link(
+ $titleObj,
+ wfMsg( 'editlink' ),
+ array(),
+ array( 'action' => 'edit' )
+ );
} else {
- $editLink = $this->makeLinkObj(
$titleObj, wfMsg('viewsourcelink'), 'action=edit' );
+ $editLink = $this->link(
+ $titleObj,
+ wfMsg( 'viewsourcelink' ),
+ array(),
+ array( 'action' => 'edit' )
+ );
}
$outText .= '<li>' . $this->link( $titleObj ) .
' (' . $editLink . ') ' . $protected . '</li>';
}
Modified: trunk/phase3/includes/parser/LinkHolderArray.php
===================================================================
--- trunk/phase3/includes/parser/LinkHolderArray.php 2009-06-06 15:39:42 UTC
(rev 51538)
+++ trunk/phase3/includes/parser/LinkHolderArray.php 2009-06-06 15:45:43 UTC
(rev 51539)
@@ -105,6 +105,7 @@
}
/**
+ * FIXME: update documentation. makeLinkObj() is deprecated.
* Replace <!--LINK--> link placeholders with actual links, in the
buffer
* Placeholders created in Skin::makeLinkObj()
* Returns an array of link CSS classes, indexed by PDBK.
Modified: trunk/phase3/includes/parser/Parser.php
===================================================================
--- trunk/phase3/includes/parser/Parser.php 2009-06-06 15:39:42 UTC (rev
51538)
+++ trunk/phase3/includes/parser/Parser.php 2009-06-06 15:45:43 UTC (rev
51539)
@@ -4070,6 +4070,7 @@
}
/**
+ * FIXME: update documentation. makeLinkObj() is deprecated.
* Replace <!--LINK--> link placeholders with actual links, in the
buffer
* Placeholders created in Skin::makeLinkObj()
* Returns an array of link CSS classes, indexed by PDBK.
Modified: trunk/phase3/includes/specials/SpecialRevisiondelete.php
===================================================================
--- trunk/phase3/includes/specials/SpecialRevisiondelete.php 2009-06-06
15:39:42 UTC (rev 51538)
+++ trunk/phase3/includes/specials/SpecialRevisiondelete.php 2009-06-06
15:45:43 UTC (rev 51539)
@@ -332,7 +332,7 @@
$wgOut->addHTML(
Xml::openElement( 'form', array( 'method' => 'post',
- 'action' => $this->getTitle()->getLocalUrl(
'action=submit' ),
+ 'action' => $this->getTitle()->getLocalUrl(
array( 'action' => 'submit' ) ),
'id' => 'mw-revdel-form-revisions' ) ) .
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, wfMsg(
'revdelete-legend' ) ) .
@@ -1065,8 +1065,15 @@
if ( $this->isDeleted() && !$this->canView() ) {
return $date;
}
- return $this->special->skin->makeLinkObj( $this->list->title,
$date,
- 'oldid='.$this->revision->getId() . '&unhide=1' );
+ return $this->special->skin->link(
+ $this->list->title,
+ $date,
+ array(),
+ array(
+ 'oldid' => $this->revision->getId(),
+ 'unhide' => 1
+ )
+ );
}
/**
@@ -1078,10 +1085,19 @@
return wfMsgHtml('diff');
} else {
return
- $this->special->skin->makeKnownLinkObj(
+ $this->special->skin->link(
$this->list->title,
wfMsgHtml('diff'),
- 'diff=' . $this->revision->getId() .
'&oldid=prev&unhide=1'
+ array()
+ array(
+ 'diff' =>
$this->revision->getId(),
+ 'oldid' => 'prev',
+ 'unhide' => 1
+ ),
+ array(
+ 'known',
+ 'noclasses'
+ )
);
}
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
