r106133 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106132‎ | r106133 | r106134 >
Date:23:46, 13 December 2011
Author:preilly
Status:ok
Tags:
Comment:
remove duplicate variables
Modified paths:
  • /trunk/extensions/MobileFrontend/MobileFrontend.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MobileFrontend/MobileFrontend.php
@@ -106,7 +106,7 @@
107107 }
108108
109109 class ExtMobileFrontend {
110 - const VERSION = '0.5.98';
 110+ const VERSION = '0.5.99';
111111
112112 /**
113113 * @var DOMDocument
@@ -787,17 +787,6 @@
788788 wfProfileIn( __METHOD__ );
789789 if ( $this->contentFormat == 'XHTML' ) {
790790 $this->getMsg();
791 - $editToken = $wgUser->editToken();
792 -
793 - $htmlTitle = self::$messages['mobile-frontend-leave-feedback'];
794 - $title = self::$messages['mobile-frontend-leave-feedback-title'];
795 - $notice = self::$messages['mobile-frontend-leave-feedback-notice'];
796 - $subject = self::$messages['mobile-frontend-leave-feedback-subject'];
797 - $message = self::$messages['mobile-frontend-leave-feedback-message'];
798 - $cancel = self::$messages['mobile-frontend-leave-feedback-cancel'];
799 - $submit = self::$messages['mobile-frontend-leave-feedback-submit'];
800 -
801 - $feedbackPostURL = str_replace( '&mobileaction=leave_feedback', '', $wgRequest->getFullRequestURL() ) . '&mobileaction=leave_feedback_post';
802791 $searchTemplate = $this->getSearchTemplate();
803792 $searchWebkitHtml = $searchTemplate->getHTML();
804793 $footerTemplate = $this->getFooterTemplate();
@@ -805,13 +794,13 @@
806795 $leaveFeedbackTemplate = new LeaveFeedbackTemplate();
807796 $options = array(
808797 'feedbackPostURL' => str_replace( '&mobileaction=leave_feedback', '', $wgRequest->getFullRequestURL() ) . '&mobileaction=leave_feedback_post',
809 - 'editToken' => $editToken,
810 - 'title' => $title,
811 - 'notice' => $notice,
812 - 'subject' => $subject,
813 - 'message' => $message,
814 - 'cancel' => $cancel,
815 - 'submit' => $submit,
 798+ 'editToken' => $wgUser->editToken(),
 799+ 'title' => self::$messages['mobile-frontend-leave-feedback-title'],
 800+ 'notice' => self::$messages['mobile-frontend-leave-feedback-notice'],
 801+ 'subject' => self::$messages['mobile-frontend-leave-feedback-subject'],
 802+ 'message' => self::$messages['mobile-frontend-leave-feedback-message'],
 803+ 'cancel' => self::$messages['mobile-frontend-leave-feedback-cancel'],
 804+ 'submit' => self::$messages['mobile-frontend-leave-feedback-submit'],
816805 );
817806 $leaveFeedbackTemplate->setByArray( $options );
818807 $leaveFeedbackHtml = $leaveFeedbackTemplate->getHTML();
@@ -820,7 +809,7 @@
821810 $applicationTemplate = $this->getApplicationTemplate();
822811 $options = array(
823812 'noticeHtml' => $noticeHtml,
824 - 'htmlTitle' => $htmlTitle,
 813+ 'htmlTitle' => self::$messages['mobile-frontend-leave-feedback'];,
825814 'searchWebkitHtml' => $searchWebkitHtml,
826815 'contentHtml' => $contentHtml,
827816 'footerHtml' => $footerHtml,

Status & tagging log