https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106342

Revision: 106342
Author:   reedy
Date:     2011-12-15 17:29:47 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Leave some FIXME comments, $noticeHtml is never defined on those paths

Modified Paths:
--------------
    trunk/extensions/MobileFrontend/MobileFrontend.php

Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.php  2011-12-15 17:28:03 UTC 
(rev 106341)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php  2011-12-15 17:29:47 UTC 
(rev 106342)
@@ -837,7 +837,7 @@
                        $leaveFeedbackTemplate->setByArray( $options );
                        $leaveFeedbackHtml = $leaveFeedbackTemplate->getHTML();
                        $contentHtml = $leaveFeedbackHtml;
-                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
'';
+                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
''; // FIXME: $noticeHtml is never already set
                        $applicationTemplate = $this->getApplicationTemplate();
                        $options = array(
                                                        'noticeHtml' => 
$noticeHtml,
@@ -877,7 +877,7 @@
                        $optInTemplate->setByArray( $options );
                        $optInHtml = $optInTemplate->getHTML();
                        $contentHtml = $optInHtml;
-                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
'';
+                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
''; // FIXME: $noticeHtml is never already set
                        $applicationTemplate = $this->getApplicationTemplate();
                        $options = array(
                                                        'noticeHtml' => 
$noticeHtml,
@@ -906,18 +906,18 @@
                        $searchWebkitHtml = $searchTemplate->getHTML();
                        $footerTemplate = $this->getFooterTemplate();
                        $footerHtml = $footerTemplate->getHTML();
-                               $optOutTemplate = new OptOutTemplate();
-                               $options = array(
-                                                               'explainOptOut' 
=> self::$messages['mobile-frontend-opt-out-explain'],
-                                                               'optOutMessage' 
=> self::$messages['mobile-frontend-opt-out-message'],
-                                                               'yesButton' => 
self::$messages['mobile-frontend-opt-out-yes-button'],
-                                                               'noButton' => 
self::$messages['mobile-frontend-opt-out-no-button'],
-                                                               'formAction' => 
wfExpandUrl( Title::newMainPage()->getFullURL(), PROTO_CURRENT ),
-                                                               );
-                               $optOutTemplate->setByArray( $options );
-                               $optOutHtml = $optOutTemplate->getHTML();
+                       $optOutTemplate = new OptOutTemplate();
+                       $options = array(
+                                                       'explainOptOut' => 
self::$messages['mobile-frontend-opt-out-explain'],
+                                                       'optOutMessage' => 
self::$messages['mobile-frontend-opt-out-message'],
+                                                       'yesButton' => 
self::$messages['mobile-frontend-opt-out-yes-button'],
+                                                       'noButton' => 
self::$messages['mobile-frontend-opt-out-no-button'],
+                                                       'formAction' => 
wfExpandUrl( Title::newMainPage()->getFullURL(), PROTO_CURRENT ),
+                                                       );
+                       $optOutTemplate->setByArray( $options );
+                       $optOutHtml = $optOutTemplate->getHTML();
                        $contentHtml = $optOutHtml;
-                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
'';
+                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
''; // FIXME: $noticeHtml is never already set
                        $applicationTemplate = $this->getApplicationTemplate();
                        $options = array(
                                                        'noticeHtml' => 
$noticeHtml,
@@ -967,7 +967,7 @@
                        $disableHtml = $disableTemplate->getHTML();
 
                        $contentHtml = $disableHtml;
-                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
'';
+                       $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : 
''; // FIXME: $noticeHtml is never already set
                        $applicationTemplate = $this->getApplicationTemplate();
                        $options = array(
                                                        'noticeHtml' => 
$noticeHtml,


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to