(bug 5167) Add {{SUBPAGENAME}} variable
[lhc/web/wiklou.git] / includes / EditPage.php
index a99328c..e15dc15 100644 (file)
@@ -24,6 +24,9 @@ class EditPage {
        var $firsttime;
        var $lastDelete;
        var $mTokenOk = true;
+       var $tooBig = false;
+       var $kblength = false;
+       var $missingComment = false;
 
        # Form values
        var $save = false, $preview = false, $diff = false;
@@ -53,7 +56,7 @@ class EditPage {
                if ( !$wgUseMetadataEdit ) return ;
                if ( $wgMetadataWhitelist == '' ) return ;
                $s = '' ;
-               $t = $this->mArticle->getContent ( true ) ;
+               $t = $this->mArticle->getContent();
 
                # MISSING : <nowiki> filtering
 
@@ -90,7 +93,7 @@ class EditPage {
                $sat = array () ; # stand-alone-templates; must be lowercase
                $wl_title = Title::newFromText ( $wgMetadataWhitelist ) ;
                $wl_article = new Article ( $wl_title ) ;
-               $wl = explode ( "\n" , $wl_article->getContent(true) ) ;
+               $wl = explode ( "\n" , $wl_article->getContent() ) ;
                foreach ( $wl AS $x )
                {
                        $isentry = false ;
@@ -142,10 +145,10 @@ class EditPage {
        }
 
        /**
-        * This is the function that gets called for "action=edit". It 
-        * sets up various member variables, then passes execution to 
+        * This is the function that gets called for "action=edit". It
+        * sets up various member variables, then passes execution to
         * another function, usually showEditForm()
-        * 
+        *
         * The edit form is self-submitting, so that when things like
         * preview and edit conflicts occur, we get the same form back
         * with the extra stuff added.  Only when the final submission
@@ -153,11 +156,12 @@ class EditPage {
         * the newly-edited page.
         */
        function edit() {
-               global $wgOut, $wgUser, $wgRequest, $wgTitle;
-               
+               global $wgOut, $wgUser, $wgRequest, $wgTitle,
+                      $wgEmailConfirmToEdit;
+
                if ( ! wfRunHooks( 'AlternateEdit', array( &$this  ) ) )
                        return;
-               
+
                $fname = 'EditPage::edit';
                wfProfileIn( $fname );
                wfDebug( "$fname: enter\n" );
@@ -176,7 +180,7 @@ class EditPage {
 
                if ( ! $this->mTitle->userCanEdit() ) {
                        wfDebug( "$fname: user can't edit\n" );
-                       $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+                       $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
                        wfProfileOut( $fname );
                        return;
                }
@@ -197,11 +201,17 @@ class EditPage {
                                return;
                        } else {
                                wfDebug( "$fname: read-only page\n" );
-                               $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+                               $wgOut->readOnlyPage( $this->mArticle->getContent(), true );
                                wfProfileOut( $fname );
                                return;
                        }
                }
+               if ($wgEmailConfirmToEdit && !$wgUser->isEmailConfirmed()) {
+                       wfDebug("$fname: user must confirm e-mail address\n");
+                       $this->userNotConfirmedPage();
+                       wfProfileOut($fname);
+                       return;
+               }
                if ( !$this->mTitle->userCan( 'create' ) && !$this->mTitle->exists() ) {
                        wfDebug( "$fname: no create permission\n" );
                        $this->noCreatePermission();
@@ -215,7 +225,7 @@ class EditPage {
                        } else if ( $this->diff ) {
                                $this->formtype = 'diff';
                        } else {
-                               $wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
+                               $wgOut->readOnlyPage( $this->mArticle->getContent() );
                                wfProfileOut( $fname );
                                return;
                        }
@@ -238,11 +248,12 @@ class EditPage {
                }
 
                wfProfileIn( "$fname-business-end" );
-               
+
                $this->isConflict = false;
                // css / js subpages of user pages get a special treatment
-               $this->isCssJsSubpage = $wgTitle->isCssJsSubpage();
-               
+               $this->isCssJsSubpage      = $wgTitle->isCssJsSubpage();
+               $this->isValidCssJsSubpage = $wgTitle->isValidCssJsSubpage();
+
                /* Notice that we can't use isDeleted, because it returns true if article is ever deleted
                 * no matter it's current state
                 */
@@ -263,7 +274,7 @@ class EditPage {
                                }
                        }
                }
-               
+
                if(!$this->mTitle->getArticleID() && ('initial' == $this->formtype || $this->firsttime )) { # new article
                        $this->showIntro();
                }
@@ -283,7 +294,7 @@ class EditPage {
                                return;
                        }
                }
-               
+
                # First time through: get contents, set time for conflict
                # checking, etc.
                if ( 'initial' == $this->formtype || $this->firsttime ) {
@@ -338,9 +349,10 @@ class EditPage {
                                wfDebug( "POST DATA: " . var_export( $_POST, true ) . "\n" );
                                $this->preview  = true;
                        } else {
-                               $this->preview = $request->getCheck( 'wpPreview' );
+                               /* Fallback for live preview */
+                               $this->preview = $request->getCheck( 'wpPreview' ) || $request->getCheck( 'wpLivePreview' );
                                $this->diff = $request->getCheck( 'wpDiff' );
-                               
+
                                if( !$this->preview ) {
                                        if ( $this->tokenOk( $request ) ) {
                                                # Some browsers will not report any submit button
@@ -364,7 +376,7 @@ class EditPage {
                        if( !preg_match( '/^\d{14}$/', $this->starttime )) {
                                $this->starttime = null;
                        }
-       
+
                        $this->recreate  = $request->getCheck( 'wpRecreate' );
 
                        $this->minoredit = $request->getCheck( 'wpMinoredit' );
@@ -393,7 +405,7 @@ class EditPage {
 
                $this->live = $request->getCheck( 'live' );
                $this->editintro = $request->getText( 'editintro' );
-               
+
                wfProfileOut( $fname );
        }
 
@@ -424,13 +436,13 @@ class EditPage {
                        if(isset($introtitle) && $introtitle->userCanRead()) {
                                $rev=Revision::newFromTitle($introtitle);
                                if($rev) {
-                                       $wgOut->addWikiText($rev->getText());
+                                       $wgOut->addSecondaryWikiText($rev->getText());
                                        $addstandardintro=false;
                                }
                        }
                }
                if($addstandardintro) {
-                       if ( $wgUser->isLoggedIn() ) 
+                       if ( $wgUser->isLoggedIn() )
                                $wgOut->addWikiText( wfMsg( 'newarticletext' ) );
                        else
                                $wgOut->addWikiText( wfMsg( 'newarticletextanon' ) );
@@ -443,7 +455,8 @@ class EditPage {
         */
        function attemptSave() {
                global $wgSpamRegex, $wgFilterCallback, $wgUser, $wgOut;
-               
+               global $wgMaxArticleSize;
+
                $fname = 'EditPage::attemptSave';
                wfProfileIn( $fname );
                wfProfileIn( "$fname-checks" );
@@ -478,7 +491,15 @@ class EditPage {
                        wfProfileOut( $fname );
                        return false;
                }
-
+               $this->kblength = (int)(strlen( $this->textbox1 ) / 1024);
+               if ( $this->kblength > $wgMaxArticleSize ) {
+                       // Error will be displayed by showEditForm()
+                       $this->tooBig = true;
+                       wfProfileOut( "$fname-checks" );
+                       wfProfileOut( $fname );
+                       return true;
+               }
+               
                if ( !$wgUser->isAllowed('edit') ) {
                        if ( $wgUser->isAnon() ) {
                                $this->userNotLoggedInPage();
@@ -514,9 +535,9 @@ class EditPage {
                        wfProfileOut( $fname );
                        return true;
                }
-               
+
                wfProfileOut( "$fname-checks" );
-               
+
                # If article is new, insert it.
                $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
                if ( 0 == $aid ) {
@@ -527,7 +548,7 @@ class EditPage {
                                wfProfileOut( $fname );
                                return;
                        }
-                       
+
                        # Don't save a new article if it's blank.
                        if ( ( '' == $this->textbox1 ) ) {
                                        $wgOut->redirect( $this->mTitle->getFullURL() );
@@ -538,7 +559,7 @@ class EditPage {
                        $isComment=($this->section=='new');
                        $this->mArticle->insertNewArticle( $this->textbox1, $this->summary,
                                $this->minoredit, $this->watchthis, false, $isComment);
-                       
+
                        wfProfileOut( $fname );
                        return false;
                }
@@ -547,7 +568,7 @@ class EditPage {
 
                $this->mArticle->clear(); # Force reload of dates, etc.
                $this->mArticle->forUpdate( true ); # Lock the article
-               
+
                if( $this->mArticle->getTimestamp() != $this->edittime ) {
                        $this->isConflict = true;
                        if( $this->section == 'new' ) {
@@ -600,16 +621,20 @@ class EditPage {
                                }
                        }
                }
-               
+
                if ( $this->isConflict ) {
                        wfProfileOut( $fname );
                        return true;
                }
-               
+
                # All's well
                wfProfileIn( "$fname-sectionanchor" );
                $sectionanchor = '';
                if( $this->section == 'new' ) {
+                       if ( $this->textbox1 == '' ) {
+                               $this->missingComment = true;
+                               return true;
+                       }
                        if( $this->summary != '' ) {
                                $sectionanchor = $this->sectionAnchor( $this->summary );
                        }
@@ -633,6 +658,14 @@ class EditPage {
                $this->textbox1 = $text;
                $this->section = '';
 
+               // Check for length errors again now that the section is merged in
+               $this->kblength = (int)(strlen( $text ) / 1024);
+               if ( $this->kblength > $wgMaxArticleSize ) {
+                       $this->tooBig = true;
+                       wfProfileOut( $fname );
+                       return true;
+               }
+
                # update the article here
                if( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit,
                        $this->watchthis, '', $sectionanchor ) ) {
@@ -651,7 +684,7 @@ class EditPage {
         */
        function initialiseForm() {
                $this->edittime = $this->mArticle->getTimestamp();
-               $this->textbox1 = $this->mArticle->getContent( true );
+               $this->textbox1 = $this->mArticle->getContent();
                $this->summary = '';
                if ( !$this->mArticle->exists() && $this->mArticle->mTitle->getNamespace() == NS_MEDIAWIKI )
                        $this->textbox1 = wfMsgWeirdKey ( $this->mArticle->mTitle->getText() ) ;
@@ -665,15 +698,15 @@ class EditPage {
         *                      near the top, for captchas and the like.
         */
        function showEditForm( $formCallback=null ) {
-               global $wgOut, $wgUser, $wgLang, $wgContLang;
+               global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize;
 
                $fname = 'EditPage::showEditForm';
                wfProfileIn( $fname );
 
                $sk =& $wgUser->getSkin();
-               
+
                wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) ) ;
-               
+
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                # Enabled article-related sidebar, toplinks, etc.
@@ -685,7 +718,7 @@ class EditPage {
                        $wgOut->addWikiText( wfMsg( 'explainconflict' ) );
 
                        $this->textbox2 = $this->textbox1;
-                       $this->textbox1 = $this->mArticle->getContent( true );
+                       $this->textbox1 = $this->mArticle->getContent();
                        $this->edittime = $this->mArticle->getTimestamp();
                } else {
 
@@ -701,12 +734,17 @@ class EditPage {
                                                if( !empty( $matches[2] ) ) {
                                                        $this->summary = "/* ". trim($matches[2])." */ ";
                                                }
-                                       }                                       
+                                       }
                                }
                        } else {
                                $s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
                        }
                        $wgOut->setPageTitle( $s );
+
+                       if ( $this->missingComment ) {
+                               $wgOut->addWikiText( wfMsg( 'missingcommenttext' ) );
+                       }
+
                        if ( !$this->checkUnicodeCompliantBrowser() ) {
                                $wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
                        }
@@ -720,16 +758,38 @@ class EditPage {
 
                if( wfReadOnly() ) {
                        $wgOut->addWikiText( wfMsg( 'readonlywarning' ) );
-               } else if ( $this->isCssJsSubpage and 'preview' != $this->formtype) {
-                       $wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ));
+               } elseif( $wgUser->isAnon() && $this->formtype != 'preview' ) {
+                       $wgOut->addWikiText( wfMsg( 'anoneditwarning' ) );
+               } else {
+                       if( $this->isCssJsSubpage && $this->formtype != 'preview' ) {
+                               # Check the skin exists
+                               if( $this->isValidCssJsSubpage ) {
+                                       $wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ) );
+                               } else {
+                                       $wgOut->addWikiText( wfMsg( 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ) );
+                               }
+                       }
                }
-               if( $this->mTitle->isProtected('edit') ) {
-                       $wgOut->addWikiText( wfMsg( 'protectedpagewarning' ) );
+                       
+               if( $this->mTitle->isProtected( 'edit' ) ) {
+                       if( $this->mTitle->isSemiProtected() ) {
+                               $notice = wfMsg( 'semiprotectedpagewarning' );
+                               if( wfEmptyMsg( 'semiprotectedpagewarning', $notice ) || $notice == '-' ) {
+                                       $notice = '';
+                               }
+                       } else {
+                               $notice = wfMsg( 'protectedpagewarning' );
+                       }
+                       $wgOut->addWikiText( $notice );
                }
 
-               $kblength = (int)(strlen( $this->textbox1 ) / 1024);
-               if( $kblength > 29 ) {
-                       $wgOut->addWikiText( wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) ) );
+               if ( $this->kblength === false ) {
+                       $this->kblength = (int)(strlen( $this->textbox1 ) / 1024);
+               }
+               if ( $this->tooBig || $this->kblength > $wgMaxArticleSize ) {
+                       $wgOut->addWikiText( wfMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgMaxArticleSize ) );
+               } elseif( $this->kblength > 29 ) {
+                       $wgOut->addWikiText( wfMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) ) );
                }
 
                $rows = $wgUser->getOption( 'rows' );
@@ -747,9 +807,6 @@ class EditPage {
                $subject = wfMsg('subject');
                $minor   = wfMsg('minoredit');
                $watchthis = wfMsg ('watchthis');
-               $save = wfMsg('savearticle');
-               $prev = wfMsg('showpreview');
-               $diff = wfMsg('showdiff');
 
                $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
                                wfMsg('cancel') );
@@ -803,11 +860,15 @@ class EditPage {
 
                $checkboxhtml = $minoredithtml . $watchhtml;
 
-               if ( 'preview' == $this->formtype && $wgUser->getOption( 'previewontop' ) ) {
-                       $this->showPreview();
-               }
-               if ( 'diff' == $this->formtype ) {
-                       if ( $wgUser->getOption('previewontop' ) ) {
+               if ( $wgUser->getOption( 'previewontop' ) ) {
+
+                       if ( 'preview' == $this->formtype ) {
+                               $this->showPreview();
+                       } else {
+                               $wgOut->addHTML( '<div id="wikiPreview"></div>' );
+                       }
+
+                       if ( 'diff' == $this->formtype ) {
                                $wgOut->addHTML( $this->getDiff() );
                        }
                }
@@ -830,13 +891,6 @@ class EditPage {
                }
                $templates = $this->formatTemplates();
 
-               global $wgLivePreview;
-               if ( $wgLivePreview ) {
-                       $liveOnclick = $this->doLivePreviewScript();
-               } else {
-                       $liveOnclick = '';
-               }
-
                global $wgUseMetadataEdit ;
                if ( $wgUseMetadataEdit ) {
                        $metadata = $this->mMetaData ;
@@ -864,6 +918,65 @@ class EditPage {
                        }
                }
 
+               $temp = array(
+                       'id'        => 'wpSave',
+                       'name'      => 'wpSave',
+                       'type'      => 'submit',
+                       'tabindex'  => '5',
+                       'value'     => wfMsg('savearticle'),
+                       'accesskey' => wfMsg('accesskey-save'),
+                       'title'     => wfMsg('tooltip-save'),
+               );
+               $buttons['save'] = wfElement('input', $temp, '');
+               $temp = array(
+                       'id'        => 'wpDiff',
+                       'name'      => 'wpDiff',
+                       'type'      => 'submit',
+                       'tabindex'  => '7',
+                       'value'     => wfMsg('showdiff'),
+                       'accesskey' => wfMsg('accesskey-diff'),
+                       'title'     => wfMsg('tooltip-diff'),
+               );
+               $buttons['diff'] = wfElement('input', $temp, '');
+
+               global $wgLivePreview;
+               if ( $wgLivePreview && $wgUser->getOption( 'uselivepreview' ) ) {
+                       $temp = array(
+                               'id'        => 'wpPreview',
+                               'name'      => 'wpPreview',
+                               'type'      => 'submit',
+                               'tabindex'  => '6',
+                               'value'     => wfMsg('showpreview'),
+                               'accesskey' => '',
+                               'title'     => wfMsg('tooltip-preview'),
+                               'style'     => 'display: none;',
+                       );
+                       $buttons['preview'] = wfElement('input', $temp, '');
+                       $temp = array(
+                               'id'        => 'wpLivePreview',
+                               'name'      => 'wpLivePreview',
+                               'type'      => 'submit',
+                               'tabindex'  => '6',
+                               'value'     => wfMsg('showlivepreview'),
+                               'accesskey' => wfMsg('accesskey-preview'),
+                               'title'     => '',
+                               'onclick'   => $this->doLivePreviewScript(),
+                       );
+                       $buttons['live'] = wfElement('input', $temp, '');
+               } else {
+                       $temp = array(
+                               'id'        => 'wpPreview',
+                               'name'      => 'wpPreview',
+                               'type'      => 'submit',
+                               'tabindex'  => '6',
+                               'value'     => wfMsg('showpreview'),
+                               'accesskey' => wfMsg('accesskey-preview'),
+                               'title'     => wfMsg('tooltip-preview'),
+                       );
+                       $buttons['preview'] = wfElement('input', $temp, '');
+                       $buttons['live'] = '';
+               }
+
                $safemodehtml = $this->checkUnicodeCompliantBrowser()
                        ? ""
                        : "<input type='hidden' name=\"safemode\" value='1' />\n";
@@ -874,6 +987,7 @@ class EditPage {
 enctype="multipart/form-data">
 END
 );
+
                if( is_callable( $formCallback ) ) {
                        call_user_func_array( $formCallback, array( &$wgOut ) );
                }
@@ -894,11 +1008,9 @@ END
 . htmlspecialchars( $this->safeUnicodeOutput( $this->textbox1 ) ) .
 "
 </textarea>
-
                " );
-               
-               $wgOut->addWikiText( $copywarn );
 
+               $wgOut->addWikiText( $copywarn );
                $wgOut->addHTML( "
 {$metadata}
 {$editsummary}
@@ -906,16 +1018,15 @@ END
 {$safemodehtml}
 ");
 
-               $wgOut->addHTML( "
+               $wgOut->addHTML("
 <div class='editButtons'>
-<input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
-" title=\"".wfMsg('tooltip-save')."\"/>
-<input tabindex='6' id='wpPreview' type='submit' $liveOnclick value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
-" 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>
-" );
+       {$buttons['save']}
+       {$buttons['preview']}
+       {$buttons['live']}
+       {$buttons['diff']}
+       <span class='editHelp'>{$cancel} | {$edithelp}</span>
+</div><!-- editButtons -->
+</div><!-- editOptions -->");
 
                $wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
 
@@ -952,17 +1063,23 @@ END
                                . htmlspecialchars( $this->safeUnicodeOutput( $this->textbox2 ) ) . "\n</textarea>" );
                }
                $wgOut->addHTML( "</form>\n" );
-               if ( $this->formtype == 'preview' && !$wgUser->getOption( 'previewontop' ) ) {
-                       $this->showPreview();
-               }
-               if ( $this->formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
-                       #$wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
-                       $wgOut->addHTML( $this->getDiff() );
+               if ( !$wgUser->getOption( 'previewontop' ) ) {
+
+                       if ( $this->formtype == 'preview') {
+                               $this->showPreview();
+                       } else {
+                               $wgOut->addHTML( '<div id="wikiPreview"></div>' );
+                       }
+               
+                       if ( $this->formtype == 'diff') {
+                               $wgOut->addHTML( $this->getDiff() );
+                       }
+
                }
 
                wfProfileOut( $fname );
        }
-       
+
        /**
         * Append preview output to $wgOut.
         * Includes category rendering if this is a category page.
@@ -997,6 +1114,14 @@ END
                $outText = '';
                $templates = $this->mArticle->getUsedTemplates();
                if ( count( $templates ) > 0 ) {
+                       # Do a batch existence check
+                       $batch = new LinkBatch;
+                       foreach( $templates as $title ) {
+                               $batch->addObj( $title );
+                       }
+                       $batch->execute();
+
+                       # Construct the HTML
                        $outText = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
                        foreach ( $templates as $titleObj ) {
                                $outText .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
@@ -1010,25 +1135,25 @@ END
        /**
         * Live Preview lets us fetch rendered preview page content and
         * add it to the page without refreshing the whole page.
-        * If not supported by the browser it will fall through to the normal form 
+        * If not supported by the browser it will fall through to the normal form
         * submission method.
-        * 
-        * This function outputs a script tag to support live preview, and 
-        * returns an onclick handler which should be added to the attributes 
+        *
+        * This function outputs a script tag to support live preview, and
+        * returns an onclick handler which should be added to the attributes
         * of the preview button
         */
        function doLivePreviewScript() {
-               global $wgStylePath, $wgJsMimeType, $wgOut;
+               global $wgStylePath, $wgJsMimeType, $wgOut, $wgTitle;
                $wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
                        htmlspecialchars( $wgStylePath . '/common/preview.js' ) .
                        '"></script>' . "\n" );
                $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
-               return 'onclick="return !livePreview('.
-                       'getElementById(\'wikiPreview\'),' .
-                       'editform.wpTextbox1.value,' .
-                       htmlspecialchars( '"' . $liveAction . '"' ) . ')"';
+               return "return !livePreview(" .
+                       "getElementById('wikiPreview')," .
+                       "editform.wpTextbox1.value," .
+                       '"' . $liveAction . '"' . ")";
        }
-       
+
        function getLastDelete() {
                $dbr =& wfGetDB( DB_SLAVE );
                $fname = 'EditPage::getLastDelete';
@@ -1093,6 +1218,7 @@ END
                        } else if(preg_match("/\\.js$/", $wgTitle->getText() ) ) {
                                $previewtext = wfMsg('userjspreview');
                        }
+                        $parserOptions->setTidy(true);
                        $parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
                        $wgOut->addHTML( $parserOutput->mText );
                        wfProfileOut( $fname );
@@ -1100,19 +1226,19 @@ END
                } else {
                        # if user want to see preview when he edit an article
                        if( $wgUser->getOption('previewonfirst') and ($this->textbox1 == '')) {
-                               $this->textbox1 = $this->mArticle->getContent(true);
+                               $this->textbox1 = $this->mArticle->getContent();
                        }
 
                        $toparse = $this->textbox1;
-                       
+
                        # If we're adding a comment, we need to show the
                        # summary as the headline
                        if($this->section=="new" && $this->summary!="") {
                                $toparse="== {$this->summary} ==\n\n".$toparse;
                        }
-                       
-                       if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ;
 
+                       if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ;
+                        $parserOptions->setTidy(true);
                        $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
                                        $wgTitle, $parserOptions );
 
@@ -1146,6 +1272,22 @@ END
                $wgOut->returnToMain( false );
        }
 
+       /**
+        * Creates a basic error page which informs the user that
+        * they have to validate their email address before being
+        * allowed to edit.
+        */
+       function userNotConfirmedPage() {
+
+               global $wgOut;
+
+               $wgOut->setPageTitle( wfMsg( 'confirmedittitle' ) );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+               $wgOut->setArticleRelated( false );
+               $wgOut->addWikiText( wfMsg( 'confirmedittext' ) );
+               $wgOut->returnToMain( false );
+       }
+
        /**
         * @todo document
         */
@@ -1251,7 +1393,7 @@ END
         * The necessary JavaScript code can be found in style/wikibits.js.
         */
        function getEditToolbar() {
-               global $wgStylePath, $wgLang, $wgJsMimeType;
+               global $wgStylePath, $wgContLang, $wgJsMimeType;
 
                /**
                 * toolarray an array of arrays which each include the filename of
@@ -1301,14 +1443,14 @@ END
                                        'key'   =>      'H'
                                ),
                        array(  'image'=>'button_image.png',
-                                       'open'  =>      '[['.$wgLang->getNsText(NS_IMAGE).":",
+                                       'open'  =>      '[['.$wgContLang->getNsText(NS_IMAGE).":",
                                        'close' =>      ']]',
                                        'sample'=>      wfMsg('image_sample'),
                                        'tip'   =>      wfMsg('image_tip'),
                                        'key'   =>      'D'
                                ),
                        array(  'image' =>'button_media.png',
-                                       'open'  =>      '[['.$wgLang->getNsText(NS_MEDIA).':',
+                                       'open'  =>      '[['.$wgContLang->getNsText(NS_MEDIA).':',
                                        'close' =>      ']]',
                                        'sample'=>      wfMsg('media_sample'),
                                        'tip'   =>      wfMsg('media_tip'),
@@ -1387,7 +1529,9 @@ END
                header( 'Content-type: text/xml' );
                header( 'Cache-control: no-cache' );
                # FIXME
-               echo $this->getPreviewText( false, false );
+               echo $this->getPreviewText( );
+               /* To not shake screen up and down between preview and live-preview */
+               echo "<br style=\"clear:both;\" />\n";
        }
 
 
@@ -1435,7 +1579,7 @@ END
                        ? $this->unmakesafe( $text )
                        : $text;
        }
-       
+
        /**
         * Filter an output field through a Unicode armoring process if it is
         * going to an old browser with known broken Unicode editing issues.
@@ -1451,7 +1595,7 @@ END
                        ? $codedText
                        : $this->makesafe( $codedText );
        }
-       
+
        /**
         * A number of web browsers are known to corrupt non-ASCII characters
         * in a UTF-8 text editing environment. To protect against this,
@@ -1468,7 +1612,7 @@ END
        function makesafe( $invalue ) {
                // Armor existing references for reversability.
                $invalue = strtr( $invalue, array( "&#x" => "&#x0" ) );
-               
+
                $bytesleft = 0;
                $result = "";
                $working = 0;
@@ -1497,7 +1641,7 @@ END
                }
                return $result;
        }
-       
+
        /**
         * Reverse the previously applied transliteration of non-ASCII characters
         * back to UTF-8. Used to protect data from corruption by broken web browsers
@@ -1517,11 +1661,11 @@ END
                                        $hexstring .= $invalue{$i};
                                        $i++;
                                } while( ctype_xdigit( $invalue{$i} ) && ( $i < strlen( $invalue ) ) );
-                               
+
                                // Do some sanity checks. These aren't needed for reversability,
-                               // but should help keep the breakage down if the editor 
+                               // but should help keep the breakage down if the editor
                                // breaks one of the entities whilst editing.
-                               if ((substr($invalue,$i,1)==";") and (strlen($hexstring) <= 6)) { 
+                               if ((substr($invalue,$i,1)==";") and (strlen($hexstring) <= 6)) {
                                        $codepoint = hexdec($hexstring);
                                        $result .= codepointToUtf8( $codepoint );
                                } else {
@@ -1534,7 +1678,7 @@ END
                // reverse the transform that we made for reversability reasons.
                return strtr( $result, array( "&#x0" => "&#x" ) );
        }
-       
+
        function noCreatePermission() {
                global $wgOut;
                $wgOut->setPageTitle( wfMsg( 'nocreatetitle' ) );