make doBlockLevels last parser stage again, and fix missing paragraphs from

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index bfe95e2..6fe2392 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -171,9 +171,8 @@ class EditPage {
                                $isConflict = false;
                        } else {
                                # switch from section editing to normal editing in edit conflict
-                               # FIXME: This is confusing. In theory we should attempt to merge, finding
-                               # the equivalent section if it's unchanged and avoid the conflict.
                                if($isConflict) {
+                    # Attempt merge
                                        if( $this->mergeChangesInto( $text ) ){
                                                // Successful merge! Maybe we should tell the user the good news?
                                                $isConflict = false;
@@ -226,7 +225,9 @@ class EditPage {
                                        $sectitle=preg_match("/^=+(.*?)=+/mi",
                                        $this->textbox1,
                                        $matches);
-                                       if($matches[1]) { $this->summary = "/* ". trim($matches[1])." */ "; }
+                                       if( !empty( $matches[1] ) ) {
+                                               $this->summary = "/* ". trim($matches[1])." */ ";
+                                       }
                                }
                        }
                        $wgOut->setPageTitle( $s );
@@ -298,22 +299,22 @@ class EditPage {
 
                if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
                        $minoredithtml =
-                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit'>".
+                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit' />".
                        "<label for='wpMinoredit'>{$minor}</label>";
                }
 
                $watchhtml = "";
 
                if ( 0 != $wgUser->getID() ) {
-                       $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked":"")." id='wpWatchthis'>".
+                       $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked":"")." id='wpWatchthis' />".
                        "<label for='wpWatchthis'>{$watchthis}</label>";
                }
 
-               $checkboxhtml = $minoredithtml . $watchhtml . "<br>";
+               $checkboxhtml = $minoredithtml . $watchhtml . "<br />";
 
                if ( "preview" == $formtype) {
                        $previewhead="<h2>" . wfMsg( "preview" ) . "</h2>\n<p><large><center><font color=\"#cc0000\">" .
-                       wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large><p>\n";
+                       wfMsg( "note" ) . wfMsg( "previewnote" ) . "</font></center></large></p>\n";
                        if ( $isConflict ) {
                                $previewhead.="<h2>" . wfMsg( "previewconflict" ) .
                                  "</h2>\n";
@@ -339,11 +340,11 @@ class EditPage {
                # Otherwise, show a summary field at the bottom
                $summarytext = htmlspecialchars( $wgLang->recodeForEdit( $this->summary ) ); # FIXME
                if( $this->section == "new" ) {
-                       $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60'><br>";
+                       $commentsubject="{$subject}: <input tabindex='1' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
                        $editsummary = "";
                } else {
                        $commentsubject = "";
-                       $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60'><br>";
+                       $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
                }
 
                if( !$this->preview ) {
@@ -360,14 +361,14 @@ cols='{$cols}'{$ew} wrap=\"virtual\">" .
 htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 "
 </textarea>
-<br>{$editsummary}
+<br />{$editsummary}
 {$checkboxhtml}
-<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\">
-<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\">
+<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\" />
+<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\" />
 <em>{$cancel}</em> | <em>{$edithelp}</em>
-<br><br>{$copywarn}
-<input type=hidden value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\">
-<input type=hidden value=\"{$this->edittime}\" name=\"wpEdittime\">\n" );
+<br /><br />{$copywarn}
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
 
                if ( $isConflict ) {
                        $wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
@@ -446,14 +447,16 @@ htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
                # Fork the processes
                if ( !$skip ) {
                        $title = Title::makeTitle( NS_SPECIAL, "Blockme" );
-                       $url = $title->getFullURL();
+                       $iphash = md5( $wgIP . $wgProxyKey );
+                       $url = $title->getFullURL( "ip=$iphash" );
+
                        foreach ( $wgProxyPorts as $port ) {
                                $params = implode( " ", array(
-                                 escapeshellarg( $wgProxyScriptPath ),
-                                 escapeshellarg( $wgIP ),
-                                 escapeshellarg( $port ),
-                                 escapeshellarg( $url )
-                               ));
+                                                       escapeshellarg( $wgProxyScriptPath ),
+                                                       escapeshellarg( $wgIP ),
+                                                       escapeshellarg( $port ),
+                                                       escapeshellarg( $url )
+                                                       ));
                                exec( "php $params &>/dev/null &" );
                        }
                        # Set MemCached key