[MediaWiki-CVS] SVN: [70446] trunk/extensions/CentralNotice

[kaldari]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70446

Revision: 70446
Author:   kaldari
Date:     2010-08-04 01:25:54 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
Fixing getTitle calls per comment in r70440

Modified Paths:
--------------
    trunk/extensions/CentralNotice/SpecialCentralNotice.php
    trunk/extensions/CentralNotice/SpecialNoticeTemplate.php

Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php     2010-08-04 
00:53:14 UTC (rev 70445)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php     2010-08-04 
01:25:54 UTC (rev 70446)
@@ -419,7 +419,7 @@
                                $htmlOut .= Xml::openElement( 'form',
                                        array(
                                                'method' => 'post',
-                                               'action' => 
SpecialPage::getTitleFor( 'CentralNotice' )->getFullUrl()
+                                               'action' => 
$this->getTitle()->getFullUrl()
                                         )
                                );
                        }
@@ -548,7 +548,7 @@
                        $htmlOut .= Xml::openElement( 'form',
                                array(
                                        'method' => 'post',
-                                       'action' =>  SpecialPage::getTitleFor( 
'CentralNotice' )->getLocalUrl()
+                                       'action' =>  
$this->getTitle()->getLocalUrl()
                                )
                        );
                        $htmlOut .= Xml::element( 'h2', null, wfMsg( 
'centralnotice-add-notice' ) );
@@ -634,7 +634,7 @@
                                        $this->addTemplateTo( $notice, 
$template, $weight[$template] );
                                }
                        }
-                       $wgOut->redirect( SpecialPage::getTitleFor( 
'CentralNotice' )->getLocalUrl( "method=listNoticeDetail&notice=$notice" ) );
+                       $wgOut->redirect( $this->getTitle()->getLocalUrl( 
"method=listNoticeDetail&notice=$notice" ) );
                        return;
                }
 
@@ -647,7 +647,7 @@
                        $htmlOut .= Xml::openElement( 'form',
                                array(
                                        'method' => 'post',
-                                       'action' => SpecialPage::getTitleFor( 
'CentralNotice' )->getLocalUrl( "method=listNoticeDetail&notice=$notice" )
+                                       'action' => 
$this->getTitle()->getLocalUrl( "method=listNoticeDetail&notice=$notice" )
                                )
                        );
                }
@@ -671,7 +671,7 @@
                        if ( $output_assigned == '' && $output_templates == '' 
) {
                                $htmlOut .= wfMsg( 'centralnotice-no-templates' 
);
                                $htmlOut .= Xml::element( 'p' );
-                               $newPage = SpecialPage::getTitleFor( 
'NoticeTemplate', 'add' );
+                               $newPage = $this->getTitleFor( 
'NoticeTemplate', 'add' );
                                $sk = $wgUser->getSkin();
                                $htmlOut .= $sk->makeLinkObj( $newPage, 
wfMsgHtml( 'centralnotice-add-template' ) );
                                $htmlOut .= Xml::element( 'p' );
@@ -863,7 +863,7 @@
                                $this->weightDropDown( 
"weight[$row->tmp_name]", $row->tmp_weight )
                        );
 
-                       $viewPage = SpecialPage::getTitleFor( 
'NoticeTemplate/view' );
+                       $viewPage = $this->getTitleFor( 'NoticeTemplate', 
'view' );
                        $render = new SpecialNoticeText();
                        $render->project = 'wikipedia';
                        global $wgRequest;
@@ -961,7 +961,7 @@
                                        );
 
                                        // Render preview
-                                       $viewPage = SpecialPage::getTitleFor( 
'NoticeTemplate/view' );
+                                       $viewPage = $this->getTitleFor( 
'NoticeTemplate', 'view' );
                                        $render = new SpecialNoticeText();
                                        $render->project = 'wikipedia';
                                        global $wgRequest;

Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php    2010-08-04 
00:53:14 UTC (rev 70445)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php    2010-08-04 
01:25:54 UTC (rev 70446)
@@ -113,7 +113,7 @@
                                $newTemplate =  $wgRequest->getVal( 
'newTemplate' );
                                // We use the returned name in case any special 
characters had to be removed
                                $template = $this->cloneTemplate( $oldTemplate, 
$newTemplate );
-                               $wgOut->redirect( SpecialPage::getTitleFor( 
'NoticeTemplate', 'view' )->getLocalUrl( "template=$template" ) );
+                               $wgOut->redirect( $this->getTitle( 'view' 
)->getLocalUrl( "template=$template" ) );
                                return;
                        }
                }
@@ -163,7 +163,7 @@
 
                if ( $this->editable ) {
                        $htmlOut .= Xml::element( 'p' );
-                       $newPage = SpecialPage::getTitleFor( 'NoticeTemplate', 
'add' );
+                       $newPage = $this->getTitle( 'add' );
                        $htmlOut .= $sk->makeLinkObj( $newPage, wfMsgHtml( 
'centralnotice-add-template' ) );
                }
                
@@ -358,7 +358,7 @@
                        $htmlOut .= Xml::openElement( 'table', array ( 
'cellpadding' => 9 ) );
                        list( $lsLabel, $lsSelect ) = Xml::languageSelector( 
$wpUserLang );
        
-                       $newPage = SpecialPage::getTitleFor( 'NoticeTemplate', 
'view' );
+                       $newPage = $this->getTitle( 'view' );
        
                        $htmlOut .= Xml::tags( 'tr', null,
                                Xml::tags( 'td', null, $lsLabel ) .
@@ -414,7 +414,7 @@
                        $htmlOut .= Xml::openElement ( 'form',
                                array(
                                        'method' => 'post',
-                                       'action' => SpecialPage::getTitleFor( 
'NoticeTemplate', 'clone' )->getLocalUrl()
+                                       'action' => $this->getTitle( 'clone' 
)->getLocalUrl()
                                )
                        );
 
@@ -458,7 +458,7 @@
 
                foreach ( $langs as $lang ) {
                        // Link and Preview all available translations
-                       $viewPage = SpecialPage::getTitleFor( 'NoticeTemplate', 
'view' );
+                       $viewPage = $this->getTitle( 'view' );
                        $render = new SpecialNoticeText();
                        $render->project = 'wikipedia';
                        $render->language = $lang;



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs