Revert experimental hack as discussed on IRC

diff --git a/includes/EditPage.php b/includes/EditPage.php
index b0cb2d6..4e39380 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -866,8 +866,17 @@ END
 </textarea>
 
                " );
+               
+               $wgOut->addWikiText( $copywarn );
+
+               $wgOut->addHTML( "
+{$metadata}
+{$editsummary}
+{$checkboxhtml}
+{$safemodehtml}
+");
 
-               $editbuttons = "
+               $wgOut->addHTML( "
 <div class='editButtons'>
 <input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
 " title=\"".wfMsg('tooltip-save')."\"/>
@@ -875,22 +884,17 @@ END
 " title=\"".wfMsg('tooltip-preview')."\"/>
 <input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
 " title=\"".wfMsg('tooltip-diff')."\"/> <span class='editHelp'>{$cancel} | {$edithelp}</span></div>
-</div>";
-
-               $wgOut->addHTML(
-                       wfMsgForContent( 'editpage-template',
-                               array(
-                                       'METADATA' => $metadata,
-                                       'SUMMARY' => $editsummary,
-                                       'CHECKBOXES' => $checkboxhtml . $safemodehtml,
-                                       'BUTTONS' => $editbuttons,
-                                       'EDITTOOLS' => $wgOut->parse( wfMsgForContent( 'edittools' ) ),
-                                       'COPYRIGHTWARNING' => $wgOut->parse( $copywarn ),
-                                       'TEMPLATES' => "<div class='templatesUsed'>$templates</div>"
-                               )
-                       )
-               );
-               
+</div>
+" );
+
+               $wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
+
+               $wgOut->addHTML( "
+<div class='templatesUsed'>
+{$templates}
+</div>
+" );
+
                if ( $wgUser->isLoggedIn() ) {
                        /**
                         * To make it harder for someone to slip a user a page

diff --git a/languages/Language.php b/languages/Language.php
index 774ed5a..743b744 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -292,15 +292,6 @@ parent class in order maintain consistency across languages.
 ** sitesupport-url|sitesupport
 ',
 
-'editpage-template' => '
-$SUMMARY
-$CHECKBOXES
-$BUTTONS
-$EDITTOOLS
-$COPYRIGHTWARNING
-$TEMPLATES
-',
-
 # User preference toggles
 'tog-underline' => 'Underline links:',
 'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).',