| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -872,8 +872,8 @@ |
| 873 | 873 | */ |
| 874 | 874 | function uploadError( $error ) { |
| 875 | 875 | global $wgOut; |
| 876 | | - $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'uploadwarning' ) . "\n" ) ); |
| 877 | | - $wgOut->addHTML( Xml::tags( 'span', array( 'class' => 'error' ), $error ) ); |
| | 876 | + $wgOut->addHTML( '<h2>' . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" ) ); |
| | 877 | + $wgOut->addHTML( '<span class="error">' . $error . '</span>' ) ); |
| 878 | 878 | } |
| 879 | 879 | |
| 880 | 880 | /** |
| — | — | @@ -894,8 +894,8 @@ |
| 895 | 895 | return; |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | | - $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'uploadwarning' ) ) . "\n" ); |
| 899 | | - $wgOut->addHTML( Xml::tags( 'ul', array( 'class' => 'warning' ), $warning ) . "\n" ); |
| | 898 | + $wgOut->addHTML( '<h2>' . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" ); |
| | 899 | + $wgOut->addHTML( '<ul class="warning">' . $warning . "</ul>\n" ); |
| 900 | 900 | |
| 901 | 901 | $titleObj = SpecialPage::getTitleFor( 'Upload' ); |
| 902 | 902 | |
| — | — | @@ -1041,9 +1041,10 @@ |
| 1042 | 1042 | $val2 = $val; |
| 1043 | 1043 | } |
| 1044 | 1044 | $val2 = $wgAllowCopyUploads ? min( $wgMaxUploadSize, $val2 ) : $val2; |
| 1045 | | - $maxUploadSize = Xml::tags( 'div', array( 'id' => 'mw-upload-maxfilesize' ), |
| | 1045 | + $maxUploadSize = '<div id="mw-upload-maxfilesize">' . |
| 1046 | 1046 | wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), |
| 1047 | | - $wgLang->formatSize( $val2 ) ) )."\n"; |
| | 1047 | + $wgLang->formatSize( $val2 ) ) ) . |
| | 1048 | + "</div>\n"; |
| 1048 | 1049 | |
| 1049 | 1050 | $sourcefilename = wfMsgExt( 'sourcefilename', array( 'parseinline', 'escapenoentities' ) ); |
| 1050 | 1051 | $destfilename = wfMsgExt( 'destfilename', array( 'parseinline', 'escapenoentities' ) ); |
| — | — | @@ -1231,8 +1232,7 @@ |
| 1232 | 1233 | ); |
| 1233 | 1234 | $uploadfooter = wfMsgNoTrans( 'uploadfooter' ); |
| 1234 | 1235 | if( $uploadfooter != '-' && !wfEmptyMsg( 'uploadfooter', $uploadfooter ) ){ |
| 1235 | | - $wgOut->addWikiText( Xml::tags( 'div', |
| 1236 | | - array( 'id' => 'mw-upload-footer-message' ), $uploadfooter ) ); |
| | 1236 | + $wgOut->addWikiText( '<div id="mw-upload-footer-message">' . $uploadfooter . '</div>' ); |
| 1237 | 1237 | } |
| 1238 | 1238 | } |
| 1239 | 1239 | |