| Index: trunk/extensions/MobileFrontend/ApplicationTemplate.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | |
| 18 | 18 | $betaPrefix = ( $this->data['isBetaGroupMember'] ) ? 'beta_' : ''; |
| 19 | 19 | |
| 20 | | - $noticeHtml = empty( $this->data['noticeHtml'] ) ? '' : $this->data['noticeHtml']; |
| | 20 | + $noticeHtml = ( isset( $this->data['noticeHtml'] ) ) ? '' : $this->data['noticeHtml']; |
| 21 | 21 | |
| 22 | 22 | $cssFileName = ( isset( $this->data['device']['css_file_name'] ) ) ? $this->data['device']['css_file_name'] : 'default'; |
| 23 | 23 | |
| Index: trunk/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -837,10 +837,8 @@ |
| 838 | 838 | $leaveFeedbackTemplate->setByArray( $options ); |
| 839 | 839 | $leaveFeedbackHtml = $leaveFeedbackTemplate->getHTML(); |
| 840 | 840 | $contentHtml = $leaveFeedbackHtml; |
| 841 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 842 | 841 | $applicationTemplate = $this->getApplicationTemplate(); |
| 843 | 842 | $options = array( |
| 844 | | - 'noticeHtml' => $noticeHtml, |
| 845 | 843 | 'htmlTitle' => self::$messages['mobile-frontend-leave-feedback'], |
| 846 | 844 | 'searchWebkitHtml' => $searchWebkitHtml, |
| 847 | 845 | 'contentHtml' => $contentHtml, |
| — | — | @@ -877,10 +875,8 @@ |
| 878 | 876 | $optInTemplate->setByArray( $options ); |
| 879 | 877 | $optInHtml = $optInTemplate->getHTML(); |
| 880 | 878 | $contentHtml = $optInHtml; |
| 881 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 882 | 879 | $applicationTemplate = $this->getApplicationTemplate(); |
| 883 | 880 | $options = array( |
| 884 | | - 'noticeHtml' => $noticeHtml, |
| 885 | 881 | 'htmlTitle' => self::$messages['mobile-frontend-opt-in-title'], |
| 886 | 882 | 'searchWebkitHtml' => $searchWebkitHtml, |
| 887 | 883 | 'contentHtml' => $contentHtml, |
| — | — | @@ -917,10 +913,8 @@ |
| 918 | 914 | $optOutTemplate->setByArray( $options ); |
| 919 | 915 | $optOutHtml = $optOutTemplate->getHTML(); |
| 920 | 916 | $contentHtml = $optOutHtml; |
| 921 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 922 | 917 | $applicationTemplate = $this->getApplicationTemplate(); |
| 923 | 918 | $options = array( |
| 924 | | - 'noticeHtml' => $noticeHtml, |
| 925 | 919 | 'htmlTitle' => self::$messages['mobile-frontend-opt-out-title'], |
| 926 | 920 | 'searchWebkitHtml' => $searchWebkitHtml, |
| 927 | 921 | 'contentHtml' => $contentHtml, |
| — | — | @@ -967,10 +961,8 @@ |
| 968 | 962 | $disableHtml = $disableTemplate->getHTML(); |
| 969 | 963 | |
| 970 | 964 | $contentHtml = $disableHtml; |
| 971 | | - $noticeHtml = ( !empty( $noticeHtml ) ) ? $noticeHtml : ''; // FIXME: $noticeHtml is never already set |
| 972 | 965 | $applicationTemplate = $this->getApplicationTemplate(); |
| 973 | 966 | $options = array( |
| 974 | | - 'noticeHtml' => $noticeHtml, |
| 975 | 967 | 'htmlTitle' => $htmlTitle, |
| 976 | 968 | 'searchWebkitHtml' => $searchWebkitHtml, |
| 977 | 969 | 'contentHtml' => $contentHtml, |