| Index: trunk/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -837,7 +837,7 @@ |
| 838 | 838 | $leaveFeedbackTemplate->setByArray( $options ); |
| 839 | 839 | $leaveFeedbackHtml = $leaveFeedbackTemplate->getHTML(); |
| 840 | 840 | $contentHtml = $leaveFeedbackHtml; |
| 841 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; |
| | 841 | + $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 842 | 842 | $applicationTemplate = $this->getApplicationTemplate(); |
| 843 | 843 | $options = array( |
| 844 | 844 | 'noticeHtml' => $noticeHtml, |
| — | — | @@ -877,7 +877,7 @@ |
| 878 | 878 | $optInTemplate->setByArray( $options ); |
| 879 | 879 | $optInHtml = $optInTemplate->getHTML(); |
| 880 | 880 | $contentHtml = $optInHtml; |
| 881 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; |
| | 881 | + $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 882 | 882 | $applicationTemplate = $this->getApplicationTemplate(); |
| 883 | 883 | $options = array( |
| 884 | 884 | 'noticeHtml' => $noticeHtml, |
| — | — | @@ -906,18 +906,18 @@ |
| 907 | 907 | $searchWebkitHtml = $searchTemplate->getHTML(); |
| 908 | 908 | $footerTemplate = $this->getFooterTemplate(); |
| 909 | 909 | $footerHtml = $footerTemplate->getHTML(); |
| 910 | | - $optOutTemplate = new OptOutTemplate(); |
| 911 | | - $options = array( |
| 912 | | - 'explainOptOut' => self::$messages['mobile-frontend-opt-out-explain'], |
| 913 | | - 'optOutMessage' => self::$messages['mobile-frontend-opt-out-message'], |
| 914 | | - 'yesButton' => self::$messages['mobile-frontend-opt-out-yes-button'], |
| 915 | | - 'noButton' => self::$messages['mobile-frontend-opt-out-no-button'], |
| 916 | | - 'formAction' => wfExpandUrl( Title::newMainPage()->getFullURL(), PROTO_CURRENT ), |
| 917 | | - ); |
| 918 | | - $optOutTemplate->setByArray( $options ); |
| 919 | | - $optOutHtml = $optOutTemplate->getHTML(); |
| | 910 | + $optOutTemplate = new OptOutTemplate(); |
| | 911 | + $options = array( |
| | 912 | + 'explainOptOut' => self::$messages['mobile-frontend-opt-out-explain'], |
| | 913 | + 'optOutMessage' => self::$messages['mobile-frontend-opt-out-message'], |
| | 914 | + 'yesButton' => self::$messages['mobile-frontend-opt-out-yes-button'], |
| | 915 | + 'noButton' => self::$messages['mobile-frontend-opt-out-no-button'], |
| | 916 | + 'formAction' => wfExpandUrl( Title::newMainPage()->getFullURL(), PROTO_CURRENT ), |
| | 917 | + ); |
| | 918 | + $optOutTemplate->setByArray( $options ); |
| | 919 | + $optOutHtml = $optOutTemplate->getHTML(); |
| 920 | 920 | $contentHtml = $optOutHtml; |
| 921 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; |
| | 921 | + $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 922 | 922 | $applicationTemplate = $this->getApplicationTemplate(); |
| 923 | 923 | $options = array( |
| 924 | 924 | 'noticeHtml' => $noticeHtml, |
| — | — | @@ -967,7 +967,7 @@ |
| 968 | 968 | $disableHtml = $disableTemplate->getHTML(); |
| 969 | 969 | |
| 970 | 970 | $contentHtml = $disableHtml; |
| 971 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; |
| | 971 | + $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 972 | 972 | $applicationTemplate = $this->getApplicationTemplate(); |
| 973 | 973 | $options = array( |
| 974 | 974 | 'noticeHtml' => $noticeHtml, |