| Index: trunk/phase3/includes/parser/LinkHolderArray.php |
| — | — | @@ -105,6 +105,7 @@ |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
| | 109 | + * FIXME: update documentation. makeLinkObj() is deprecated. |
| 109 | 110 | * Replace <!--LINK--> link placeholders with actual links, in the buffer |
| 110 | 111 | * Placeholders created in Skin::makeLinkObj() |
| 111 | 112 | * Returns an array of link CSS classes, indexed by PDBK. |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -4070,6 +4070,7 @@ |
| 4071 | 4071 | } |
| 4072 | 4072 | |
| 4073 | 4073 | /** |
| | 4074 | + * FIXME: update documentation. makeLinkObj() is deprecated. |
| 4074 | 4075 | * Replace <!--LINK--> link placeholders with actual links, in the buffer |
| 4075 | 4076 | * Placeholders created in Skin::makeLinkObj() |
| 4076 | 4077 | * Returns an array of link CSS classes, indexed by PDBK. |
| Index: trunk/phase3/includes/Linker.php |
| — | — | @@ -1669,9 +1669,19 @@ |
| 1670 | 1670 | $protected = ''; |
| 1671 | 1671 | } |
| 1672 | 1672 | if( $titleObj->quickUserCan( 'edit' ) ) { |
| 1673 | | - $editLink = $this->makeLinkObj( $titleObj, wfMsg('editlink'), 'action=edit' ); |
| | 1673 | + $editLink = $this->link( |
| | 1674 | + $titleObj, |
| | 1675 | + wfMsg( 'editlink' ), |
| | 1676 | + array(), |
| | 1677 | + array( 'action' => 'edit' ) |
| | 1678 | + ); |
| 1674 | 1679 | } else { |
| 1675 | | - $editLink = $this->makeLinkObj( $titleObj, wfMsg('viewsourcelink'), 'action=edit' ); |
| | 1680 | + $editLink = $this->link( |
| | 1681 | + $titleObj, |
| | 1682 | + wfMsg( 'viewsourcelink' ), |
| | 1683 | + array(), |
| | 1684 | + array( 'action' => 'edit' ) |
| | 1685 | + ); |
| 1676 | 1686 | } |
| 1677 | 1687 | $outText .= '<li>' . $this->link( $titleObj ) . ' (' . $editLink . ') ' . $protected . '</li>'; |
| 1678 | 1688 | } |
| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -332,7 +332,7 @@ |
| 333 | 333 | |
| 334 | 334 | $wgOut->addHTML( |
| 335 | 335 | Xml::openElement( 'form', array( 'method' => 'post', |
| 336 | | - 'action' => $this->getTitle()->getLocalUrl( 'action=submit' ), |
| | 336 | + 'action' => $this->getTitle()->getLocalUrl( array( 'action' => 'submit' ) ), |
| 337 | 337 | 'id' => 'mw-revdel-form-revisions' ) ) . |
| 338 | 338 | Xml::openElement( 'fieldset' ) . |
| 339 | 339 | Xml::element( 'legend', null, wfMsg( 'revdelete-legend' ) ) . |
| — | — | @@ -1065,8 +1065,15 @@ |
| 1066 | 1066 | if ( $this->isDeleted() && !$this->canView() ) { |
| 1067 | 1067 | return $date; |
| 1068 | 1068 | } |
| 1069 | | - return $this->special->skin->makeLinkObj( $this->list->title, $date, |
| 1070 | | - 'oldid='.$this->revision->getId() . '&unhide=1' ); |
| | 1069 | + return $this->special->skin->link( |
| | 1070 | + $this->list->title, |
| | 1071 | + $date, |
| | 1072 | + array(), |
| | 1073 | + array( |
| | 1074 | + 'oldid' => $this->revision->getId(), |
| | 1075 | + 'unhide' => 1 |
| | 1076 | + ) |
| | 1077 | + ); |
| 1071 | 1078 | } |
| 1072 | 1079 | |
| 1073 | 1080 | /** |
| — | — | @@ -1078,10 +1085,19 @@ |
| 1079 | 1086 | return wfMsgHtml('diff'); |
| 1080 | 1087 | } else { |
| 1081 | 1088 | return |
| 1082 | | - $this->special->skin->makeKnownLinkObj( |
| | 1089 | + $this->special->skin->link( |
| 1083 | 1090 | $this->list->title, |
| 1084 | 1091 | wfMsgHtml('diff'), |
| 1085 | | - 'diff=' . $this->revision->getId() . '&oldid=prev&unhide=1' |
| | 1092 | + array() |
| | 1093 | + array( |
| | 1094 | + 'diff' => $this->revision->getId(), |
| | 1095 | + 'oldid' => 'prev', |
| | 1096 | + 'unhide' => 1 |
| | 1097 | + ), |
| | 1098 | + array( |
| | 1099 | + 'known', |
| | 1100 | + 'noclasses' |
| | 1101 | + ) |
| 1086 | 1102 | ); |
| 1087 | 1103 | } |
| 1088 | 1104 | } |