profiling improvements and bug fixes
[lhc/web/wiklou.git] / includes / EditPage.php
index 7bfdcd6..6304cef 100644 (file)
@@ -40,12 +40,11 @@ class EditPage {
         * To turn the feature on, set $wgUseMetadataEdit = true ; in LocalSettings
         *  and set $wgMetadataWhitelist to the *full* title of the template whitelist
         */
-       function extractMetaDataFromArticle ()
-       {
+       function extractMetaDataFromArticle () {
                global $wgUseMetadataEdit , $wgMetadataWhitelist , $wgLang ;
                $this->mMetaData = '' ;
                if ( !$wgUseMetadataEdit ) return ;
-               if ( $wgMetadataWhitelist == "" ) return ;
+               if ( $wgMetadataWhitelist == '' ) return ;
                $s = '' ;
                $t = $this->mArticle->getContent ( true ) ;
 
@@ -58,11 +57,11 @@ class EditPage {
                foreach ( $t AS $key => $x )
                {
                        $y = trim ( strtolower ( $x ) ) ;
-                       while ( substr ( $y , 0 , 2 ) == "[[" )
+                       while ( substr ( $y , 0 , 2 ) == '[[' )
                        {
-                               $y = explode ( "]]" , trim ( $x ) ) ;
+                               $y = explode ( ']]' , trim ( $x ) ) ;
                                $first = array_shift ( $y ) ;
-                               $first = explode ( ":" , $first ) ;
+                               $first = explode ( ':' , $first ) ;
                                $ns = array_shift ( $first ) ;
                                $ns = trim ( str_replace ( '[' , '' , $ns ) ) ;
                                if ( strlen ( $ns ) == 2 OR strtolower ( $ns ) == $catlow )
@@ -135,7 +134,7 @@ class EditPage {
         * This is the function that gets called for "action=edit".
         */
        function edit() {
-               global $wgOut, $wgUser, $wgWhitelistEdit, $wgRequest;
+               global $wgOut, $wgUser, $wgRequest;
                // this is not an article
                $wgOut->setArticleFlag(false);
 
@@ -150,15 +149,20 @@ class EditPage {
                        $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
                        return;
                }
-               if ( !$this->preview && !$this->diff && $wgUser->isBlocked( !$this->save ) ) {
+               if ( !$this->preview && !$this->diff && $wgUser->isBlockedFrom( $this->mTitle, !$this->save ) ) {
                        # When previewing, don't check blocked state - will get caught at save time.
                        # Also, check when starting edition is done against slave to improve performance.
                        $this->blockedIPpage();
                        return;
                }
-               if ( $wgUser->isAnon() && $wgWhitelistEdit ) {
-                       $this->userNotLoggedInPage();
-                       return;
+               if ( !$wgUser->isAllowed('edit') ) {
+                       if ( $wgUser->isAnon() ) {
+                               $this->userNotLoggedInPage();
+                               return;
+                       } else {
+                               $wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
+                               return;
+                       }
                }
                if ( wfReadOnly() ) {
                        if( $this->save || $this->preview ) {
@@ -177,7 +181,7 @@ class EditPage {
                } else if ( $this->diff ) {
                        $this->editForm( 'diff' );
                } else { # First time through
-                       if( $wgUser->getOption('previewonfirst') ) {
+                       if( $this->previewOnOpen() ) {
                                $this->editForm( 'preview', true );
                        } else {
                                $this->extractMetaDataFromArticle () ;
@@ -185,6 +189,19 @@ class EditPage {
                        }
                }
        }
+       
+       /**
+        * Return true if this page should be previewed when the edit form
+        * is initially opened.
+        * @return bool
+        * @access private
+        */
+       function previewOnOpen() {
+               global $wgUser;
+               return $wgUser->getOption( 'previewonfirst' ) ||
+                       ( $this->mTitle->getNamespace() == NS_CATEGORY &&
+                               !$this->mTitle->exists() );
+       }
 
        /**
         * @todo document
@@ -197,7 +214,7 @@ class EditPage {
                        $this->textbox1  = rtrim( $request->getText( 'wpTextbox1' ) );
                        $this->textbox2  = rtrim( $request->getText( 'wpTextbox2' ) );
                        $this->mMetaData = rtrim( $request->getText( 'metadata'   ) );
-                       $this->summary   =  trim( $request->getText( 'wpSummary'  ) );
+                       $this->summary   =        $request->getText( 'wpSummary'  );
        
                        $this->edittime = $request->getVal( 'wpEdittime' );
                        if( is_null( $this->edittime ) ) {
@@ -281,8 +298,7 @@ class EditPage {
        function editForm( $formtype, $firsttime = false ) {
                global $wgOut, $wgUser;
                global $wgLang, $wgContLang, $wgParser, $wgTitle;
-               global $wgAllowAnonymousMinor;
-               global $wgWhitelistEdit;
+               global $wgAllowAnonymousMinor, $wgRequest;
                global $wgSpamRegex, $wgFilterCallback;
 
                $sk = $wgUser->getSkin();
@@ -290,9 +306,22 @@ class EditPage {
                // css / js subpages of user pages get a special treatment
                $isCssJsSubpage = $wgTitle->isCssJsSubpage();
                
-
                if(!$this->mTitle->getArticleID()) { # new article
-                       $wgOut->addWikiText(wfmsg('newarticletext'));
+                       $editintro = $wgRequest->getText( 'editintro' );
+                       $addstandardintro=true;
+                       if($editintro) {
+                               $introtitle=Title::newFromText($editintro);
+                               if(isset($introtitle) && $introtitle->userCanRead()) {
+                                       $rev=Revision::newFromTitle($introtitle);
+                                       if($rev) {
+                                               $wgOut->addWikiText($rev->getText());   
+                                               $addstandardintro=false;
+                                       }
+                               }
+                       }
+                       if($addstandardintro) {
+                               $wgOut->addWikiText(wfmsg('newarticletext'));                           
+                       }
                }
 
                if( $this->mTitle->isTalkPage() ) {
@@ -318,19 +347,31 @@ class EditPage {
                                # Error messages or other handling should be performed by the filter function
                                return;
                        }
-                       if ( $wgUser->isBlocked( false ) ) {
+                       if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) {
                                # Check block state against master, thus 'false'.
                                $this->blockedIPpage();
                                return;
                        }
-                       if ( $wgUser->isAnon() && $wgWhitelistEdit ) {
+
+                       if ( !$wgUser->isAllowed('edit') ) {
+                               if ( $wgUser->isAnon() ) {
                                $this->userNotLoggedInPage();
                                return;
                        }
+                               else {
+                                       $wgOut->readOnlyPage();
+                                       return;
+                               }
+                       }
+
                        if ( wfReadOnly() ) {
                                $wgOut->readOnlyPage();
                                return;
                        }
+                       if ( $wgUser->pingLimiter() ) {
+                               $wgOut->rateLimited();
+                               return;
+                       }
 
                        # If article is new, insert it.
                        $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE );
@@ -343,9 +384,11 @@ class EditPage {
                                }
                                if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$this->textbox1,
                                                           &$this->summary, &$this->minoredit, &$this->watchthis, NULL)))
-                               {
+                               {                                       
+                                       
+                                       $isComment=($this->section=='new');
                                        $this->mArticle->insertNewArticle( $this->textbox1, $this->summary,
-                                                                                                          $this->minoredit, $this->watchthis );
+                                                                                                          $this->minoredit, $this->watchthis, false, $isComment);
                                        wfRunHooks('ArticleSaveComplete', array(&$this->mArticle, &$wgUser, $this->textbox1,
                                                                                                                        $this->summary, $this->minoredit,
                                                                                                                        $this->watchthis, NULL));
@@ -365,16 +408,20 @@ class EditPage {
                        $userid = $wgUser->getID();
 
                        if ( $isConflict) {
+                               wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" .
+                                       $this->mArticle->getTimestamp() . "'\n" );
                                $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
                                        $this->section, $this->textbox1, $this->summary, $this->edittime);
                        }
                        else {
+                               wfDebug( "EditPage::editForm getting section '$this->section'\n" );
                                $text = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
                                        $this->section, $this->textbox1, $this->summary);
                        }
                        # Suppress edit conflict with self
 
                        if ( ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) {
+                               wfDebug( "Suppressing edit conflict, same user.\n" );
                                $isConflict = false;
                        } else {
                                # switch from section editing to normal editing in edit conflict
@@ -383,9 +430,11 @@ class EditPage {
                                        if( $this->mergeChangesInto( $text ) ){
                                                // Successful merge! Maybe we should tell the user the good news?
                                                $isConflict = false;
+                                               wfDebug( "Suppressing edit conflict, successful merge.\n" );
                                        } else {
                                                $this->section = '';
                                                $this->textbox1 = $text;
+                                               wfDebug( "Keeping edit conflict, failed merge.\n" );
                                        }
                                }
                        }
@@ -409,6 +458,13 @@ class EditPage {
                                        }
                                }
                                
+                               // Save errors may fall down to the edit form, but we've now
+                               // merged the section into full text. Clear the section field
+                               // so that later submission of conflict forms won't try to
+                               // replace that into a duplicated mess.
+                               $this->textbox1 = $text;
+                               $this->section = '';
+                               
                                if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$text,
                                                                                                        &$this->summary, &$this->minoredit,
                                                                                                        &$this->watchthis, &$sectionanchor)))
@@ -421,9 +477,9 @@ class EditPage {
                                                                                                                                $this->summary, $this->minoredit,
                                                                                                                                $this->watchthis, $sectionanchor));
                                                return;
+                                       } else {
+                                               $isConflict = true;
                                        }
-                                       else
-                                         $isConflict = true;
                                }
                        }
                }
@@ -444,7 +500,7 @@ class EditPage {
                if ( $isConflict ) {
                        $s = wfMsg( 'editconflict', $this->mTitle->getPrefixedText() );
                        $wgOut->setPageTitle( $s );
-                       $wgOut->addHTML( wfMsg( 'explainconflict' ) );
+                       $wgOut->addWikiText( wfMsg( 'explainconflict' ) );
 
                        $this->textbox2 = $this->textbox1;
                        $this->textbox1 = $this->mArticle->getContent( true );
@@ -456,14 +512,14 @@ class EditPage {
                                        $s = wfMsg('editingcomment', $this->mTitle->getPrefixedText() );
                                } else {
                                        $s = wfMsg('editingsection', $this->mTitle->getPrefixedText() );
-                               }
-                               if(!$this->preview) {
-                                       preg_match( "/^(=+)(.+)\\1/mi",
-                                               $this->textbox1,
-                                               $matches );
-                                       if( !empty( $matches[2] ) ) {
-                                               $this->summary = "/* ". trim($matches[2])." */ ";
-                                       }
+                                       if( !$this->preview && !$this->diff ) {
+                                               preg_match( "/^(=+)(.+)\\1/mi",
+                                                       $this->textbox1,
+                                                       $matches );
+                                               if( !empty( $matches[2] ) ) {
+                                                       $this->summary = "/* ". trim($matches[2])." */ ";
+                                               }
+                                       }                                       
                                }
                        } else {
                                $s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
@@ -473,29 +529,26 @@ class EditPage {
                                $this->mArticle->setOldSubtitle();
                                $wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
                        }
-                       if ( $this->oldid ) {
+                       if ( isset( $this->mArticle )
+                            && isset( $this->mArticle->mRevision )
+                            && !$this->mArticle->mRevision->isCurrent() ) {
                                $this->mArticle->setOldSubtitle();
-                               $wgOut->addHTML( wfMsg( 'editingold' ) );
+                               $wgOut->addWikiText( wfMsg( 'editingold' ) );
                        }
                }
 
                if( wfReadOnly() ) {
-                       $wgOut->addHTML( '<strong>' .
-                       wfMsg( 'readonlywarning' ) .
-                       "</strong>" );
+                       $wgOut->addWikiText( wfMsg( 'readonlywarning' ) );
                } else if ( $isCssJsSubpage and 'preview' != $formtype) {
-                       $wgOut->addHTML( wfMsg( 'usercssjsyoucanpreview' ));
+                       $wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ));
                }
                if( $this->mTitle->isProtected('edit') ) {
-                       $wgOut->addHTML( '<strong>' . wfMsg( 'protectedpagewarning' ) .
-                         "</strong><br />\n" );
+                       $wgOut->addWikiText( wfMsg( 'protectedpagewarning' ) );
                }
 
                $kblength = (int)(strlen( $this->textbox1 ) / 1024);
                if( $kblength > 29 ) {
-                       $wgOut->addHTML( '<strong>' .
-                               wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) )
-                               . '</strong>' );
+                       $wgOut->addWikiText( wfMsg( 'longpagewarning', $wgLang->formatNum( $kblength ) ) );
                }
 
                $rows = $wgUser->getOption( 'rows' );
@@ -519,7 +572,7 @@ class EditPage {
 
                $cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
                                wfMsg('cancel') );
-               $edithelpurl = $sk->makeUrl( wfMsg( 'edithelppage' ));
+               $edithelpurl = $sk->makeInternalOrExternalUrl( wfMsg( 'edithelppage' ));
                $edithelp = '<a target="helpwindow" href="'.$edithelpurl.'">'.
                        htmlspecialchars( wfMsg( 'edithelp' ) ).'</a> '.
                        htmlspecialchars( wfMsg( 'newwindow' ) );
@@ -572,26 +625,17 @@ class EditPage {
                        $previewOutput = $this->getPreviewText( $isConflict, $isCssJsSubpage );
                        if ( $wgUser->getOption('previewontop' ) ) {
                                $wgOut->addHTML( $previewOutput );
+                               if($this->mTitle->getNamespace() == NS_CATEGORY) {
+                                       $this->mArticle->closeShowCategory();
+                               }                               
                                $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
                        }
                }
                $wgOut->addHTML( '</div>' );
                if ( 'diff' == $formtype ) {
-                       $wgOut->addHTML( '<div id="wikiDiff">' );
-                       require_once( 'DifferenceEngine.php' );
-                       $oldtext = $this->mArticle->getContent( true );
-                       $newtext = $this->textbox1;
-                       $oldtitle = wfMsg( 'currentrev' );
-                       $newtitle = wfMsg( 'yourtext' );
-                               
-                       if ( $oldtext != wfMsg( 'noarticletext' ) || $newtext != '' ) {
-                               $difftext = DifferenceEngine::getDiff( $oldtext, $newtext, $oldtitle, $newtitle );
-                       }
                        if ( $wgUser->getOption('previewontop' ) ) {
-                               $wgOut->addHTML( $difftext );
-                               $wgOut->addHTML( "<br style=\"clear:both;\" />\n" );
+                               $wgOut->addHTML( $this->getDiff() );
                        }
-                       $wgOut->addHTML( '</div>' );
                }
 
 
@@ -603,7 +647,7 @@ class EditPage {
                                $editsummary = '';
                        } else {
                                $commentsubject = '';
-                               $editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
+                               $editsummary="{$summary}: <input tabindex='2' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
                        }
 
                if( !$this->preview && !$this->diff ) {
@@ -612,26 +656,15 @@ class EditPage {
                }
                # Prepare a list of templates used by this page
                $templates = '';
-               $id = $this->mTitle->getArticleID();
-               if ( 0 !== $id ) {
-                       $db =& wfGetDB( DB_SLAVE );
-                       $page = $db->tableName( 'page' );
-                       $links = $db->tableName( 'links' );
-                       $sql = "SELECT page_namespace,page_title,page_id ".
-                               "FROM $page,$links WHERE l_to=page_id AND l_from={$id} and page_namespace=".NS_TEMPLATE;
-                       $res = $db->query( $sql, "EditPage::editform" );
-                       if ( false !== $res ) {
-                               if ( $db->numRows( $res ) ) {
-                                       $templates = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
-                                       while ( $row = $db->fetchObject( $res ) ) {
-                                               if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
-                                                       $templates .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
-                                               }
-                                       }
-                                       $templates .= '</ul>';
+               $articleTemplates = $this->mArticle->getUsedTemplates();
+               if ( count( $articleTemplates ) > 0 ) {
+                       $templates = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
+                       foreach ( $articleTemplates as $tpl ) {
+                               if ( $titleObj = Title::makeTitle( NS_TEMPLATE, $tpl ) ) {
+                                       $templates .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
                                }
-                               $db->freeResult( $res );
                        }
+                       $templates .= '</ul>';
                }
                
                global $wgLivePreview, $wgStylePath;
@@ -642,7 +675,8 @@ class EditPage {
                 * it will fall through to the normal form submission method.
                 */
                if( $wgLivePreview ) {
-                       $wgOut->addHTML( '<script type="text/javascript" src="' .
+                       global $wgJsMimeType;
+                       $wgOut->addHTML( '<script type="'.$wgJsMimeType.'" src="' .
                                htmlspecialchars( $wgStylePath . '/common/preview.js' ) .
                                '"></script>' . "\n" );
                        $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
@@ -681,10 +715,10 @@ END
 <br />{$editsummary}
 {$checkboxhtml}
 <input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
-" title=\"".wfMsg('tooltip-save')."\"/>&emsp;
+" 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='6' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
+<input tabindex='7' id='wpDiff' type='submit' value=\"{$diff}\" name=\"wpDiff\" accesskey=\"".wfMsg('accesskey-diff')."\"".
 " title=\"".wfMsg('tooltip-diff')."\"/>
 <em>{$cancel}</em> | <em>{$edithelp}</em>{$templates}" );
                $wgOut->addWikiText( $copywarn );
@@ -709,12 +743,12 @@ END
                
                if ( $isConflict ) {
                        require_once( "DifferenceEngine.php" );
-                       $wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
+                       $wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
                        DifferenceEngine::showDiff( $this->textbox2, $this->textbox1,
                          wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
 
-                       $wgOut->addHTML( "<h2>" . wfMsg( "yourtext" ) . "</h2>
-<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
+                       $wgOut->addWikiText( '==' . wfMsg( "yourtext" ) . '==' );
+                       $wgOut->addHTML( "<textarea tabindex=6 id='wpTextbox2' name=\"wpTextbox2\" rows='{$rows}' cols='{$cols}' wrap='virtual'>"
 . htmlspecialchars( $wgContLang->recodeForEdit( $this->textbox2 ) ) .
 "
 </textarea>" );
@@ -724,13 +758,11 @@ END
                        $wgOut->addHTML( '<div id="wikiPreview">' . $previewOutput . '</div>' );
                }
                if ( $formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
-                       $wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
+                       #$wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
+                       $wgOut->addHTML( $this->getDiff() );
                }
        }
 
-       function getDiffText() {
-       }
-
        /**
         * @todo document
         */
@@ -764,14 +796,21 @@ END
                                $this->textbox1 = $this->mArticle->getContent(true);
                        }
 
-                       $toparse = $this->textbox1 ;
+                       $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 ;
                        
                        $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
                                        $wgTitle, $parserOptions );             
                        
                        $previewHTML = $parserOutput->mText;
-
+                       
                        $wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
                        $wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
                        return $previewhead . $previewHTML;
@@ -883,18 +922,36 @@ END
         * @access private
         * @todo document
         */
-       function mergeChangesInto( &$text ){
-               $yourtext = $this->mArticle->fetchRevisionText();
+       function mergeChangesInto( &$editText ){
+               $fname = 'EditPage::mergeChangesInto';
+               wfProfileIn( $fname );
+
+               $db =& wfGetDB( DB_MASTER );
                
-               $db =& wfGetDB( DB_SLAVE );
-               $oldText = $this->mArticle->fetchRevisionText(
-                       $db->timestamp( $this->edittime ),
-                       'rev_timestamp' );
+               // This is the revision the editor started from
+               $baseRevision = Revision::loadFromTimestamp(
+                       $db, $this->mArticle->mTitle, $this->edittime );
+               if( is_null( $baseRevision ) ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               $baseText = $baseRevision->getText();
+
+               // The current state, we want to merge updates into it
+               $currentRevision =  Revision::loadFromTitle(
+                       $db, $this->mArticle->mTitle );
+               if( is_null( $currentRevision ) ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               $currentText = $currentRevision->getText();
                
-               if(wfMerge($oldText, $text, $yourtext, $result)){
-                       $text = $result;
+               if( wfMerge( $baseText, $editText, $currentText, $result ) ){
+                       $editText = $result;
+                       wfProfileOut( $fname );
                        return true;
                } else {
+                       wfProfileOut( $fname );
                        return false;
                }
        }
@@ -918,8 +975,7 @@ END
         * @access private
         */
        function sectionAnchor( $text ) {
-               global $wgInputEncoding;
-               $headline = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
+               $headline = Sanitizer::decodeCharReferences( $text );
                # strip out HTML 
                $headline = preg_replace( '/<.*?' . '>/', '', $headline );
                $headline = trim( $headline );
@@ -940,7 +996,7 @@ END
         * The necessary JavaScript code can be found in style/wikibits.js.
         */
        function getEditToolbar() {
-               global $wgStylePath, $wgLang, $wgMimeType;
+               global $wgStylePath, $wgLang, $wgMimeType, $wgJsMimeType;
 
                /**
                 * toolarray an array of arrays which each include the filename of
@@ -996,35 +1052,35 @@ END
                                        'tip'   =>      wfMsg('image_tip'),
                                        'key'   =>      'D'
                                ),
-                       array(  'image' =>      'button_media.png',
+                       array(  'image' =>'button_media.png',
                                        'open'  =>      '[['.$wgLang->getNsText(NS_MEDIA).':',
                                        'close' =>      ']]',
                                        'sample'=>      wfMsg('media_sample'),
                                        'tip'   =>      wfMsg('media_tip'),
                                        'key'   =>      'M'
                                ),
-                       array(  'image' =>      'button_math.png',
+                       array(  'image' =>'button_math.png',
                                        'open'  =>      "\\<math\\>",
                                        'close' =>      "\\</math\\>",
                                        'sample'=>      wfMsg('math_sample'),
                                        'tip'   =>      wfMsg('math_tip'),
                                        'key'   =>      'C'
                                ),
-                       array(  'image' =>      'button_nowiki.png',
+                       array(  'image' =>'button_nowiki.png',
                                        'open'  =>      "\\<nowiki\\>",
                                        'close' =>      "\\</nowiki\\>",
                                        'sample'=>      wfMsg('nowiki_sample'),
                                        'tip'   =>      wfMsg('nowiki_tip'),
                                        'key'   =>      'N'
                                ),
-                       array(  'image' =>      'button_sig.png',
+                       array(  'image' =>'button_sig.png',
                                        'open'  =>      '--~~~~',
                                        'close' =>      '',
                                        'sample'=>      '',
                                        'tip'   =>      wfMsg('sig_tip'),
                                        'key'   =>      'Y'
                                ),
-                       array(  'image' =>      'button_hr.png',
+                       array(  'image' =>'button_hr.png',
                                        'open'  =>      "\\n----\\n",
                                        'close' =>      '',
                                        'sample'=>      '',
@@ -1032,7 +1088,7 @@ END
                                        'key'   =>      'R'
                                )
                );
-               $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
+               $toolbar ="<script type='$wgJsMimeType'>\n/*<![CDATA[*/\n";
 
                $toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
                foreach($toolarray as $tool) {
@@ -1040,20 +1096,21 @@ END
                        $image=$wgStylePath.'/common/images/'.$tool['image'];
                        $open=$tool['open'];
                        $close=$tool['close'];
-                       $sample = addslashes( $tool['sample'] );
+                       $sample = wfEscapeJsString( $tool['sample'] );
 
                        // Note that we use the tip both for the ALT tag and the TITLE tag of the image.
                        // Older browsers show a "speedtip" type message only for ALT.
                        // Ideally these should be different, realistically they
                        // probably don't need to be.
-                       $tip = addslashes( $tool['tip'] );
+                       $tip = wfEscapeJsString( $tool['tip'] );
 
                        #$key = $tool["key"];
 
                        $toolbar.="addButton('$image','$tip','$open','$close','$sample');\n";
                }
 
-               $toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
+               $toolbar.="addInfobox('" . wfEscapeJsString( wfMsg( "infobox" ) ) .
+                       "','" . wfEscapeJsString( wfMsg( "infobox_alert" ) ) . "');\n";
                $toolbar.="document.writeln(\"</div>\");\n";
 
                $toolbar.="/*]]>*/\n</script>";
@@ -1081,6 +1138,30 @@ END
                echo $this->getPreviewText( false, false );
        }
 
+
+       /**
+        * Get a diff between the current contents of the edit box and the
+        * version of the page we're editing from.
+        *
+        * If this is a section edit, we'll replace the section as for final
+        * save and then make a comparison.
+        *
+        * @return string HTML
+        */
+       function getDiff() {
+               require_once( 'DifferenceEngine.php' );
+               $oldtext = $this->mArticle->fetchContent();
+               $newtext = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
+                       $this->section, $this->textbox1, $this->summary, $this->edittime );
+               $oldtitle = wfMsg( 'currentrev' );
+               $newtitle = wfMsg( 'yourtext' );
+               if ( $oldtext != wfMsg( 'noarticletext' ) || $newtext != '' ) {
+                       $difftext = DifferenceEngine::getDiff( $oldtext, $newtext, $oldtitle, $newtitle );
+               }
+               
+               return '<div id="wikiDiff">' . $difftext . '</div>';
+       }
+
 }
 
 ?>