| Index: branches/CentralNotice-SpecialPage-Integration/SpecialCentralNotice.php |
| — | — | @@ -205,7 +205,7 @@ |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | $htmlOut .= Xml::tags( 'td', $style, |
| 209 | | - $sk->link( $title, htmlspecialchars( $msg ) ) |
| | 209 | + $sk->makeLinkObj( $title, htmlspecialchars( $msg ) ) |
| 210 | 210 | ); |
| 211 | 211 | } |
| 212 | 212 | $htmlOut .= Xml::closeElement( 'tr' ); |
| — | — | @@ -364,12 +364,9 @@ |
| 365 | 365 | $fields = array(); |
| 366 | 366 | |
| 367 | 367 | // Name |
| 368 | | - $fields[] = $sk->link( $this->getTitle(), |
| | 368 | + $fields[] = $sk->makeLinkObj( $this->getTitle(), |
| 369 | 369 | htmlspecialchars( $row->not_name ), |
| 370 | | - array(), |
| 371 | | - array( |
| 372 | | - 'method' => 'listNoticeDetail', |
| 373 | | - 'notice' => $row->not_name ) ); |
| | 370 | + 'method=listNoticeDetail¬ice=' . urlencode( $row->not_name ) ); |
| 374 | 371 | |
| 375 | 372 | // Project |
| 376 | 373 | $fields[] = htmlspecialchars( $this->getProjectName( $row->not_project ) ); |
| — | — | @@ -724,10 +721,9 @@ |
| 725 | 722 | global $wgRequest; |
| 726 | 723 | $render->language = $wgRequest->getVal( 'wpUserLanguage' ); |
| 727 | 724 | $htmlOut .= Xml::tags( 'td', null, |
| 728 | | - $sk->link( $viewPage, |
| | 725 | + $sk->makeLinkObj( $viewPage, |
| 729 | 726 | htmlspecialchars( $row->tmp_name ), |
| 730 | | - array(), |
| 731 | | - array( 'template' => $row->tmp_name ) ) . |
| | 727 | + 'template=' . urlencode( $row->tmp_name ) ) . |
| 732 | 728 | Xml::fieldset( wfMsg( 'centralnotice-preview' ), |
| 733 | 729 | $render->getHtmlNotice( $row->tmp_name ) |
| 734 | 730 | ) |
| — | — | @@ -808,10 +804,9 @@ |
| 809 | 805 | global $wgRequest; |
| 810 | 806 | $render->language = $wgRequest->getVal( 'wpUserLanguage' ); |
| 811 | 807 | $htmlOut .= Xml::tags( 'td', null, |
| 812 | | - $sk->link( $viewPage, |
| | 808 | + $sk->makeLinkObj( $viewPage, |
| 813 | 809 | htmlspecialchars( $row->tmp_name ), |
| 814 | | - array(), |
| 815 | | - array( 'template' => $row->tmp_name ) ) . |
| | 810 | + 'template=' . urlencode( $row->tmp_name ) ) . |
| 816 | 811 | Xml::fieldset( wfMsg( 'centralnotice-preview' ), |
| 817 | 812 | $render->getHtmlNotice( $row->tmp_name ) |
| 818 | 813 | ) |
| Index: branches/CentralNotice-SpecialPage-Integration/SpecialNoticeTemplate.php |
| — | — | @@ -147,10 +147,9 @@ |
| 148 | 148 | $render->project = 'wikipedia'; |
| 149 | 149 | $render->language = $wgRequest->getVal( 'wpUserLanguage' ); |
| 150 | 150 | $htmlOut .= Xml::tags( 'td', null, |
| 151 | | - $sk->link( $viewPage, |
| | 151 | + $sk->makeLinkObj( $viewPage, |
| 152 | 152 | htmlspecialchars( $templateName ), |
| 153 | | - array(), |
| 154 | | - array( 'template' => $templateName ) ) . |
| | 153 | + 'template=' . urlencode( $templateName ) ) . |
| 155 | 154 | Xml::fieldset( wfMsg( 'centralnotice-preview' ), |
| 156 | 155 | $render->getHtmlNotice( $templateName ) |
| 157 | 156 | ) |
| — | — | @@ -174,7 +173,7 @@ |
| 175 | 174 | |
| 176 | 175 | // Show add link |
| 177 | 176 | $newPage = SpecialPage::getTitleFor( 'NoticeTemplate/add' ); |
| 178 | | - $htmlOut .= $sk->link( $newPage, wfMsgHtml( 'centralnotice-add-template' ) ); |
| | 177 | + $htmlOut .= $sk->makeLinkObj( $newPage, wfMsgHtml( 'centralnotice-add-template' ) ); |
| 179 | 178 | |
| 180 | 179 | // Output HTML |
| 181 | 180 | $wgOut->addHtml( $htmlOut ); |
| — | — | @@ -270,7 +269,7 @@ |
| 271 | 270 | |
| 272 | 271 | $title = Title::newFromText( "MediaWiki:{$message}" ); |
| 273 | 272 | $htmlOut .= Xml::tags( 'td', null, |
| 274 | | - $sk->link( $title, htmlspecialchars( $field ) ) |
| | 273 | + $sk->makeLinkObj( $title, htmlspecialchars( $field ) ) |
| 275 | 274 | ); |
| 276 | 275 | |
| 277 | 276 | $htmlOut .= Xml::element( 'td', null, $count); |