From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 4 Dec 2005 00:35:14 +0000 (+0000)
Subject: Revert experimental hack as discussed on IRC
X-Git-Tag: 1.6.0~1044
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=15fe345da7efc471761850ab5e3654d80e54852c;p=lhc%2Fweb%2Fwiklou.git

Revert experimental hack as discussed on IRC
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index b0cb2d6ae9..4e393802c9 100644
--- 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 774ed5a0f3..743b744ae0 100644
--- 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>).',