X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=ecd4bbb0fe6f8ad36904f6978d912dc1453d2be0;hb=fd2900c8a45145a1ca9dc0e15d5033366c21b9d0;hp=e733ef12f0fe14fe999ad95bb87197982298898c;hpb=7c7951f78fac944934a18bf34b1e12cd8ec3c850;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/EditPage.php b/includes/EditPage.php index e733ef12f0..ecd4bbb0fe 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -84,6 +84,7 @@ class EditPage { /* $didSave should be set to true whenever an article was succesfully altered. */ public $didSave = false; + public $undidRev = 0; public $suppressIntro = false; @@ -102,7 +103,12 @@ class EditPage { $this->editFormTextBeforeContent = $this->editFormTextAfterWarn = $this->editFormTextAfterTools = - $this->editFormTextBottom = ""; + $this->editFormTextBottom = + $this->mPreloadText = ""; + } + + function getArticle() { + return $this->mArticle; } /** @@ -110,7 +116,7 @@ class EditPage { * @private */ function getContent( $def_text = '' ) { - global $wgOut, $wgRequest, $wgParser, $wgMessageCache; + global $wgOut, $wgRequest, $wgParser, $wgContLang, $wgMessageCache; wfProfileIn( __METHOD__ ); # Get variables from query string :P @@ -122,11 +128,14 @@ class EditPage { $text = ''; // For message page not locally set, use the i18n message. // For other non-existent articles, use preload text if any. - if( !$this->mTitle->exists() ) { - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { - $wgMessageCache->loadAllMessages(); + if ( !$this->mTitle->exists() ) { + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { # If this is a system message, get the default text. - $text = wfMsgWeirdKey( $this->mTitle->getText() ) ; + list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); + $wgMessageCache->loadAllMessages( $lang ); + $text = wfMsgGetKey( $message, false, $lang, false ); + if( wfEmptyMsg( $message, $text ) ) + $text = ''; } else { # If requested, preload some text. $text = $this->getPreloadedText( $preload ); @@ -134,14 +143,14 @@ class EditPage { // For existing pages, get text based on "undo" or section parameters. } else { $text = $this->mArticle->getContent(); - if( $undo > 0 && $undoafter > 0 && $undo < $undoafter ) { + if ( $undo > 0 && $undoafter > 0 && $undo < $undoafter ) { # If they got undoafter and undo round the wrong way, switch them list( $undo, $undoafter ) = array( $undoafter, $undo ); } - if( $undo > 0 && $undo > $undoafter ) { + if ( $undo > 0 && $undo > $undoafter ) { # Undoing a specific edit overrides section editing; section-editing # doesn't work with undoing. - if( $undoafter ) { + if ( $undoafter ) { $undorev = Revision::newFromId($undo); $oldrev = Revision::newFromId($undoafter); } else { @@ -152,43 +161,36 @@ class EditPage { # Sanity check, make sure it's the right page, # the revisions exist and they were not deleted. # Otherwise, $text will be left as-is. - if( !is_null( $undorev ) && !is_null( $oldrev ) && + if ( !is_null( $undorev ) && !is_null( $oldrev ) && $undorev->getPage() == $oldrev->getPage() && $undorev->getPage() == $this->mArticle->getID() && !$undorev->isDeleted( Revision::DELETED_TEXT ) && !$oldrev->isDeleted( Revision::DELETED_TEXT ) ) { - $undorev_text = $undorev->getText(); - $oldrev_text = $oldrev->getText(); - $currev_text = $text; - - if( $currev_text != $undorev_text ) { - $result = wfMerge( $undorev_text, $oldrev_text, $currev_text, $text ); + + $undotext = $this->mArticle->getUndoText( $undorev, $oldrev ); + if ( $undotext === false ) { + # Warn the user that something went wrong + $this->editFormPageTop .= $wgOut->parse( '
' . wfMsgNoTrans( 'undo-failure' ) . '
' ); } else { - # No use doing a merge if it's just a straight revert. - $text = $oldrev_text; - $result = true; - } - if( $result ) { + $text = $undotext; # Inform the user of our success and set an automatic edit summary - $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-success' ) ); + $this->editFormPageTop .= $wgOut->parse( '
' . wfMsgNoTrans( 'undo-success' ) . '
' ); $firstrev = $oldrev->getNext(); # If we just undid one rev, use an autosummary - if( $firstrev->mId == $undo ) { - $this->summary = wfMsgForContent('undo-summary', $undo, $undorev->getUserText()); + if ( $firstrev->mId == $undo ) { + $this->summary = wfMsgForContent( 'undo-summary', $undo, $undorev->getUserText() ); + $this->undidRev = $undo; } $this->formtype = 'diff'; - } else { - # Warn the user that something went wrong - $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-failure' ) ); } } else { // Failed basic sanity checks. // Older revisions may have been removed since the link // was created, or we may simply have got bogus input. - $this->editFormPageTop .= $wgOut->parse( wfMsgNoTrans( 'undo-norev' ) ); + $this->editFormPageTop .= $wgOut->parse( '
' . wfMsgNoTrans( 'undo-norev' ) . '
' ); } - } else if( $section != '' ) { - if( $section == 'new' ) { + } else if ( $section != '' ) { + if ( $section == 'new' ) { $text = $this->getPreloadedText( $preload ); } else { $text = $wgParser->getSection( $text, $section, $def_text ); @@ -199,6 +201,11 @@ class EditPage { wfProfileOut( __METHOD__ ); return $text; } + + /** Use this method before edit() to preload some text into the edit box */ + public function setPreloadedText( $text ) { + $this->mPreloadText = $text; + } /** * Get the contents of a page from its title and remove includeonly tags @@ -207,13 +214,15 @@ class EditPage { * @return string The contents of the page. */ protected function getPreloadedText( $preload ) { - if( $preload === '' ) { + if ( !empty($this->mPreloadText) ) { + return $this->mPreloadText; + } elseif ( $preload === '' ) { return ''; } else { $preloadTitle = Title::newFromText( $preload ); - if( isset( $preloadTitle ) && $preloadTitle->userCanRead() ) { + if ( isset( $preloadTitle ) && $preloadTitle->userCanRead() ) { $rev = Revision::newFromTitle($preloadTitle); - if( is_object( $rev ) ) { + if ( is_object( $rev ) ) { $text = $rev->getText(); // TODO FIXME: AAAAAAAAAAA, this shouldn't be implementing // its own mini-parser! -ævar @@ -231,93 +240,87 @@ class EditPage { * and set $wgMetadataWhitelist to the *full* title of the template whitelist */ function extractMetaDataFromArticle () { - global $wgUseMetadataEdit , $wgMetadataWhitelist , $wgLang ; - $this->mMetaData = '' ; - if( !$wgUseMetadataEdit ) return ; - if( $wgMetadataWhitelist == '' ) return ; - $s = '' ; + global $wgUseMetadataEdit, $wgMetadataWhitelist, $wgContLang; + $this->mMetaData = ''; + if ( !$wgUseMetadataEdit ) return; + if ( $wgMetadataWhitelist == '' ) return; + $s = ''; $t = $this->getContent(); # MISSING : filtering # Categories and language links - $t = explode ( "\n" , $t ) ; - $catlow = strtolower ( $wgLang->getNsText ( NS_CATEGORY ) ) ; - $cat = $ll = array() ; - foreach ( $t AS $key => $x ) - { - $y = trim ( strtolower ( $x ) ) ; - while ( substr ( $y , 0 , 2 ) == '[[' ) - { - $y = explode ( ']]' , trim ( $x ) ) ; - $first = array_shift ( $y ) ; - $first = explode ( ':' , $first ) ; - $ns = array_shift ( $first ) ; - $ns = trim ( str_replace ( '[' , '' , $ns ) ) ; - if( strlen ( $ns ) == 2 OR strtolower ( $ns ) == $catlow ) - { - $add = '[[' . $ns . ':' . implode ( ':' , $first ) . ']]' ; - if( strtolower ( $ns ) == $catlow ) $cat[] = $add ; - else $ll[] = $add ; - $x = implode ( ']]' , $y ) ; - $t[$key] = $x ; - $y = trim ( strtolower ( $x ) ) ; + $t = explode ( "\n" , $t ); + $catlow = strtolower ( $wgContLang->getNsText( NS_CATEGORY ) ); + $cat = $ll = array(); + foreach ( $t AS $key => $x ) { + $y = trim ( strtolower ( $x ) ); + while ( substr ( $y , 0 , 2 ) == '[[' ) { + $y = explode ( ']]' , trim ( $x ) ); + $first = array_shift ( $y ); + $first = explode ( ':' , $first ); + $ns = array_shift ( $first ); + $ns = trim ( str_replace ( '[' , '' , $ns ) ); + if ( $wgContLang->getLanguageName( $ns ) || strtolower ( $ns ) == $catlow ) { + $add = '[[' . $ns . ':' . implode ( ':' , $first ) . ']]'; + if ( strtolower ( $ns ) == $catlow ) $cat[] = $add; + else $ll[] = $add; + $x = implode ( ']]' , $y ); + $t[$key] = $x; + $y = trim ( strtolower ( $x ) ); + } else { + $x = implode ( ']]' , $y ); + $y = trim ( strtolower ( $x ) ); } } } - if( count ( $cat ) ) $s .= implode ( ' ' , $cat ) . "\n" ; - if( count ( $ll ) ) $s .= implode ( ' ' , $ll ) . "\n" ; - $t = implode ( "\n" , $t ) ; + if ( count ( $cat ) ) $s .= implode ( ' ' , $cat ) . "\n"; + if ( count ( $ll ) ) $s .= implode ( ' ' , $ll ) . "\n"; + $t = implode ( "\n" , $t ); # Load whitelist $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() ) ; - foreach ( $wl AS $x ) - { - $isentry = false ; - $x = trim ( $x ) ; - while ( substr ( $x , 0 , 1 ) == '*' ) - { - $isentry = true ; - $x = trim ( substr ( $x , 1 ) ) ; + $wl_title = Title::newFromText ( $wgMetadataWhitelist ); + $wl_article = new Article ( $wl_title ); + $wl = explode ( "\n" , $wl_article->getContent() ); + foreach ( $wl AS $x ) { + $isentry = false; + $x = trim ( $x ); + while ( substr ( $x , 0 , 1 ) == '*' ) { + $isentry = true; + $x = trim ( substr ( $x , 1 ) ); } - if( $isentry ) - { - $sat[] = strtolower ( $x ) ; + if ( $isentry ) { + $sat[] = strtolower ( $x ); } } # Templates, but only some - $t = explode ( '{{' , $t ) ; + $t = explode ( '{{' , $t ); $tl = array () ; - foreach ( $t AS $key => $x ) - { - $y = explode ( '}}' , $x , 2 ) ; - if( count ( $y ) == 2 ) - { - $z = $y[0] ; - $z = explode ( '|' , $z ) ; - $tn = array_shift ( $z ) ; - if( in_array ( strtolower ( $tn ) , $sat ) ) - { - $tl[] = '{{' . $y[0] . '}}' ; - $t[$key] = $y[1] ; - $y = explode ( '}}' , $y[1] , 2 ) ; + foreach ( $t AS $key => $x ) { + $y = explode ( '}}' , $x , 2 ); + if ( count ( $y ) == 2 ) { + $z = $y[0]; + $z = explode ( '|' , $z ); + $tn = array_shift ( $z ); + if ( in_array ( strtolower ( $tn ) , $sat ) ) { + $tl[] = '{{' . $y[0] . '}}'; + $t[$key] = $y[1]; + $y = explode ( '}}' , $y[1] , 2 ); } - else $t[$key] = '{{' . $x ; + else $t[$key] = '{{' . $x; } - else if( $key != 0 ) $t[$key] = '{{' . $x ; - else $t[$key] = $x ; + else if ( $key != 0 ) $t[$key] = '{{' . $x; + else $t[$key] = $x; } - if( count ( $tl ) ) $s .= implode ( ' ' , $tl ) ; - $t = implode ( '' , $t ) ; + if ( count ( $tl ) ) $s .= implode ( ' ' , $tl ); + $t = implode ( '' , $t ); - $t = str_replace ( "\n\n\n" , "\n" , $t ) ; - $this->mArticle->mContent = $t ; - $this->mMetaData = $s ; + $t = str_replace ( "\n\n\n" , "\n" , $t ); + $this->mArticle->mContent = $t; + $this->mMetaData = $s; } /* @@ -327,13 +330,13 @@ class EditPage { * deletes. */ protected function wasDeletedSinceLastEdit() { - if( $this->deletedSinceEdit ) + if ( $this->deletedSinceEdit ) return true; - if( $this->mTitle->isDeleted() ) { + if ( $this->mTitle->isDeletedQuick() ) { $this->lastDelete = $this->getLastDelete(); - if( !is_null($this->lastDelete) ) { - $deletetime = $this->lastDelete->log_timestamp; - if( ($deletetime - $this->starttime) > 0 ) { + if ( $this->lastDelete ) { + $deleteTime = wfTimestamp( TS_MW, $this->lastDelete->log_timestamp ); + if ( $deleteTime > $this->starttime ) { $this->deletedSinceEdit = true; } } @@ -357,9 +360,9 @@ class EditPage { * the newly-edited page. */ function edit() { - global $wgOut, $wgUser, $wgRequest; + global $wgOut, $wgRequest; // Allow extensions to modify/prevent this form or submission - if( !wfRunHooks( 'AlternateEdit', array( &$this ) ) ) { + if ( !wfRunHooks( 'AlternateEdit', array( &$this ) ) ) { return; } @@ -372,43 +375,35 @@ class EditPage { $this->importFormData( $wgRequest ); $this->firsttime = false; - if( $this->live ) { + if ( $this->live ) { $this->livePreview(); wfProfileOut( __METHOD__ ); return; } - if( wfReadOnly() ) { - if( $this->save ){ + if ( wfReadOnly() && $this->save ) { // Force preview $this->save = false; $this->preview = true; - } elseif( $this->preview || $this->diff ) { - // A warning will be displayed instead - } else { - $this->readOnlyPage( $this->getContent() ); - wfProfileOut( __METHOD__ ); - return; - } } $wgOut->addScriptFile( 'edit.js' ); - - if( $permErrors = $this->getEditPermissionErrors() ) { + $permErrors = $this->getEditPermissionErrors(); + if ( $permErrors ) { wfDebug( __METHOD__.": User can't edit\n" ); $this->readOnlyPage( $this->getContent(), true, $permErrors, 'edit' ); wfProfileOut( __METHOD__ ); return; } else { - if( $this->save ) { + if ( $this->save ) { $this->formtype = 'save'; - } else if( $this->preview ) { + } else if ( $this->preview ) { $this->formtype = 'preview'; - } else if( $this->diff ) { + } else if ( $this->diff ) { $this->formtype = 'diff'; } else { # First time through $this->firsttime = true; - if( $this->previewOnOpen() ) { + if ( $this->previewOnOpen() ) { $this->formtype = 'preview'; } else { $this->extractMetaDataFromArticle () ; @@ -416,6 +411,11 @@ class EditPage { } } } + + // If they used redlink=1 and the page exists, redirect to the main article + if ( $wgRequest->getBool( 'redlink' ) && $this->mTitle->exists() ) { + $wgOut->redirect( $this->mTitle->getFullURL() ); + } wfProfileIn( __METHOD__."-business-end" ); @@ -425,30 +425,27 @@ class EditPage { $this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage(); # Show applicable editing introductions - if( $this->formtype == 'initial' || $this->firsttime ) + if ( $this->formtype == 'initial' || $this->firsttime ) $this->showIntro(); - if( $this->mTitle->isTalkPage() ) { + if ( $this->mTitle->isTalkPage() ) { $wgOut->addWikiMsg( 'talkpagetext' ); } # Optional notices on a per-namespace and per-page basis $editnotice_ns = 'editnotice-'.$this->mTitle->getNamespace(); - $editnotice_page = $editnotice_ns.'-'.$this->mTitle->getDBkey(); - if( !wfEmptyMsg( $editnotice_ns, wfMsgForContent( $editnotice_ns ) ) ) { + if ( !wfEmptyMsg( $editnotice_ns, wfMsgForContent( $editnotice_ns ) ) ) { $wgOut->addWikiText( wfMsgForContent( $editnotice_ns ) ); } - if( MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) { + if ( MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) { $parts = explode( '/', $this->mTitle->getDBkey() ); $editnotice_base = $editnotice_ns; while ( count( $parts ) > 0 ) { $editnotice_base .= '-'.array_shift( $parts ); - if( !wfEmptyMsg( $editnotice_base, wfMsgForContent( $editnotice_base ) ) ) { + if ( !wfEmptyMsg( $editnotice_base, wfMsgForContent( $editnotice_base ) ) ) { $wgOut->addWikiText( wfMsgForContent( $editnotice_base ) ); } } - } else if( !wfEmptyMsg( $editnotice_page, wfMsgForContent( $editnotice_page ) ) ) { - $wgOut->addWikiText( wfMsgForContent( $editnotice_page ) ); } # Attempt submission here. This will check for edit conflicts, @@ -456,8 +453,8 @@ class EditPage { # that edit() already checked just in case someone tries to sneak # in the back door with a hand-edited submission URL. - if( 'save' == $this->formtype ) { - if( !$this->attemptSave() ) { + if ( 'save' == $this->formtype ) { + if ( !$this->attemptSave() ) { wfProfileOut( __METHOD__."-business-end" ); wfProfileOut( __METHOD__ ); return; @@ -466,14 +463,14 @@ class EditPage { # First time through: get contents, set time for conflict # checking, etc. - if( 'initial' == $this->formtype || $this->firsttime ) { - if( $this->initialiseForm() === false) { + if ( 'initial' == $this->formtype || $this->firsttime ) { + if ( $this->initialiseForm() === false) { $this->noSuchSectionPage(); wfProfileOut( __METHOD__."-business-end" ); wfProfileOut( __METHOD__ ); return; } - if( !$this->mTitle->getArticleId() ) + if ( !$this->mTitle->getArticleId() ) wfRunHooks( 'EditFormPreloadText', array( &$this->textbox1, &$this->mTitle ) ); } @@ -486,14 +483,14 @@ class EditPage { global $wgUser; $permErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ); # Can this title be created? - if( !$this->mTitle->exists() ) { + if ( !$this->mTitle->exists() ) { $permErrors = array_merge( $permErrors, wfArrayDiff2( $this->mTitle->getUserPermissionsErrors( 'create', $wgUser ), $permErrors ) ); } # Ignore some permissions errors when a user is just previewing/viewing diffs $remove = array(); foreach( $permErrors as $error ) { - if( ($this->preview || $this->diff) && + if ( ($this->preview || $this->diff) && ($error[0] == 'blockedtext' || $error[0] == 'autoblockedtext') ) { $remove[] = $error; @@ -510,7 +507,7 @@ class EditPage { */ function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) { global $wgRequest, $wgOut; - if( $wgRequest->getBool( 'redlink' ) ) { + if ( $wgRequest->getBool( 'redlink' ) ) { // The edit page was reached via a red link. // Redirect to the article page and let them click the edit tab if // they really want a permission error. @@ -527,19 +524,19 @@ class EditPage { */ protected function previewOnOpen() { global $wgRequest, $wgUser; - if( $wgRequest->getVal( 'preview' ) == 'yes' ) { + if ( $wgRequest->getVal( 'preview' ) == 'yes' ) { // Explicit override from request return true; - } elseif( $wgRequest->getVal( 'preview' ) == 'no' ) { + } elseif ( $wgRequest->getVal( 'preview' ) == 'no' ) { // Explicit override from request return false; - } elseif( $this->section == 'new' ) { + } elseif ( $this->section == 'new' ) { // Nothing *to* preview for new sections return false; - } elseif( ( $wgRequest->getVal( 'preload' ) !== '' || $this->mTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) { + } elseif ( ( $wgRequest->getVal( 'preload' ) !== null || $this->mTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) { // Standard preference behaviour return true; - } elseif( !$this->mTitle->exists() && $this->mTitle->getNamespace() == NS_CATEGORY ) { + } elseif ( !$this->mTitle->exists() && $this->mTitle->getNamespace() == NS_CATEGORY ) { // Categories are special return true; } else { @@ -559,7 +556,7 @@ class EditPage { # Section edit can come from either the form or a link $this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) ); - if( $request->wasPosted() ) { + if ( $request->wasPosted() ) { # These fields need to be checked for encoding. # Also remove trailing whitespace, but don't remove _initial_ # whitespace from the text boxes. This may be significant formatting. @@ -567,7 +564,7 @@ class EditPage { $this->textbox2 = $this->safeUnicodeInput( $request, 'wpTextbox2' ); $this->mMetaData = rtrim( $request->getText( 'metadata' ) ); # Truncate for whole multibyte characters. +5 bytes for ellipsis - $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250 ); + $this->summary = $wgLang->truncate( $request->getText( 'wpSummary' ), 250, '' ); # Remove extra headings from summaries and new sections. $this->summary = preg_replace('/^\s*=+\s*(.*?)\s*=+\s*$/', '$1', $this->summary); @@ -577,11 +574,11 @@ class EditPage { $this->scrolltop = $request->getIntOrNull( 'wpScrolltop' ); - if( is_null( $this->edittime ) ) { + if ( is_null( $this->edittime ) ) { # If the form is incomplete, force to preview. wfDebug( "$fname: Form data appears to be incomplete\n" ); wfDebug( "POST DATA: " . var_export( $_POST, true ) . "\n" ); - $this->preview = true; + $this->preview = true; } else { /* Fallback for live preview */ $this->preview = $request->getCheck( 'wpPreview' ) || $request->getCheck( 'wpLivePreview' ); @@ -591,13 +588,13 @@ class EditPage { // if we forced preview due to session failure. $this->mTriedSave = !$this->preview; - if( $this->tokenOk( $request ) ) { + if ( $this->tokenOk( $request ) ) { # Some browsers will not report any submit button # if the user hits enter in the comment box. # The unmarked state will be assumed to be a save, # if the form seems otherwise complete. wfDebug( "$fname: Passed token check.\n" ); - } else if( $this->diff ) { + } else if ( $this->diff ) { # Failed token check, but only requested "Show Changes". wfDebug( "$fname: Failed token check; Show Changes requested.\n" ); } else { @@ -608,11 +605,11 @@ class EditPage { } } $this->save = !$this->preview && !$this->diff; - if( !preg_match( '/^\d{14}$/', $this->edittime )) { + if ( !preg_match( '/^\d{14}$/', $this->edittime )) { $this->edittime = null; } - if( !preg_match( '/^\d{14}$/', $this->starttime )) { + if ( !preg_match( '/^\d{14}$/', $this->starttime )) { $this->starttime = null; } @@ -622,10 +619,12 @@ class EditPage { $this->watchthis = $request->getCheck( 'wpWatchthis' ); # Don't force edit summaries when a user is editing their own user or talk page - if( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && $this->mTitle->getText() == $wgUser->getName() ) { + if ( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK ) && + $this->mTitle->getText() == $wgUser->getName() ) + { $this->allowBlankSummary = true; } else { - $this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ); + $this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' ) || !$wgUser->getOption( 'forceeditsummary'); } $this->autoSumm = $request->getText( 'wpAutoSummary' ); @@ -646,17 +645,28 @@ class EditPage { $this->watchthis = false; $this->recreate = false; - if( $this->section == 'new' && $request->getVal( 'preloadtitle' ) ) { + if ( $this->section == 'new' && $request->getVal( 'preloadtitle' ) ) { $this->summary = $request->getVal( 'preloadtitle' ); } + elseif ( $this->section != 'new' && $request->getVal( 'summary' ) ) { + $this->summary = $request->getText( 'summary' ); + } + + if ( $request->getVal( 'minor' ) ) { + $this->minoredit = true; + } } + // FIXME: unused variable? $this->oldid = $request->getInt( 'oldid' ); $this->live = $request->getCheck( 'live' ); $this->editintro = $request->getText( 'editintro' ); wfProfileOut( $fname ); + + // Allow extensions to modify form data + wfRunHooks( 'EditPage::importFormData', array( &$this ) ); } /** @@ -679,30 +689,40 @@ class EditPage { */ protected function showIntro() { global $wgOut, $wgUser; - if( $this->suppressIntro ) { + if ( $this->suppressIntro ) { return; } + + $namespace = $this->mTitle->getNamespace(); + + if ( $namespace == NS_MEDIAWIKI ) { + # Show a warning if editing an interface message + $wgOut->wrapWikiMsg( "
\n$1
", 'editinginterface' ); + } + # Show a warning message when someone creates/edits a user (talk) page but the user does not exists - if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) { + if ( $namespace == NS_USER || $namespace == NS_USER_TALK ) { $parts = explode( '/', $this->mTitle->getText(), 2 ); $username = $parts[0]; $id = User::idFromName( $username ); $ip = User::isIP( $username ); - if( $id == 0 && !$ip ) { + if ( $id == 0 && !$ip ) { $wgOut->wrapWikiMsg( '
$1
', array( 'userpage-userdoesnotexist', $username ) ); } } # Try to add a custom edit intro, or use the standard one if this is not possible. - if( !$this->showCustomIntro() && !$this->mTitle->exists() ) { - if( $wgUser->isLoggedIn() ) { + if ( !$this->showCustomIntro() && !$this->mTitle->exists() ) { + if ( $wgUser->isLoggedIn() ) { $wgOut->wrapWikiMsg( '
$1
', 'newarticletext' ); } else { $wgOut->wrapWikiMsg( '
$1
', 'newarticletextanon' ); } } - # Give a notice if the user is editing a deleted page... - $this->showDeletionLog( $wgOut ); + # Give a notice if the user is editing a deleted/moved page... + if ( !$this->mTitle->exists() ) { + $this->showLogs( $wgOut ); + } } /** @@ -711,9 +731,9 @@ class EditPage { * @return bool */ protected function showCustomIntro() { - if( $this->editintro ) { + if ( $this->editintro ) { $title = Title::newFromText( $this->editintro ); - if( $title instanceof Title && $title->exists() && $title->userCanRead() ) { + if ( $title instanceof Title && $title->exists() && $title->userCanRead() ) { global $wgOut; $revision = Revision::newFromTitle( $title ); $wgOut->addWikiTextTitleTidy( $revision->getText(), $this->mTitle ); @@ -738,17 +758,17 @@ class EditPage { wfProfileIn( $fname ); wfProfileIn( "$fname-checks" ); - if( !wfRunHooks( 'EditPage::attemptSave', array( &$this ) ) ) + if ( !wfRunHooks( 'EditPage::attemptSave', array( &$this ) ) ) { - wfDebug( "Hook 'EditPage::attemptSave' aborted article saving" ); + wfDebug( "Hook 'EditPage::attemptSave' aborted article saving\n" ); return self::AS_HOOK_ERROR; } # Check image redirect - if( $this->mTitle->getNamespace() == NS_IMAGE && + if ( $this->mTitle->getNamespace() == NS_FILE && Title::newFromRedirect( $this->textbox1 ) instanceof Title && !$wgUser->isAllowed( 'upload' ) ) { - if( $wgUser->isAnon() ) { + if ( $wgUser->isAnon() ) { return self::AS_IMAGE_REDIRECT_ANON; } else { return self::AS_IMAGE_REDIRECT_LOGGED; @@ -756,15 +776,15 @@ class EditPage { } # Reintegrate metadata - if( $this->mMetaData != '' ) $this->textbox1 .= "\n" . $this->mMetaData ; + if ( $this->mMetaData != '' ) $this->textbox1 .= "\n" . $this->mMetaData ; $this->mMetaData = '' ; # Check for spam - $match = self::matchSpamRegex( $this->summary ); - if( $match === false ) { + $match = self::matchSummarySpamRegex( $this->summary ); + if ( $match === false ) { $match = self::matchSpamRegex( $this->textbox1 ); } - if( $match !== false ) { + if ( $match !== false ) { $result['spam'] = $match; $ip = wfGetIP(); $pdbk = $this->mTitle->getPrefixedDBkey(); @@ -774,31 +794,31 @@ class EditPage { wfProfileOut( $fname ); return self::AS_SPAM_ERROR; } - if( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section, $this->hookError, $this->summary ) ) { + if ( $wgFilterCallback && $wgFilterCallback( $this->mTitle, $this->textbox1, $this->section, $this->hookError, $this->summary ) ) { # Error messages or other handling should be performed by the filter function wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_FILTERING; } - if( !wfRunHooks( 'EditFilter', array( $this, $this->textbox1, $this->section, &$this->hookError, $this->summary ) ) ) { + if ( !wfRunHooks( 'EditFilter', array( $this, $this->textbox1, $this->section, &$this->hookError, $this->summary ) ) ) { # Error messages etc. could be handled within the hook... wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_HOOK_ERROR; - } elseif( $this->hookError != '' ) { + } elseif ( $this->hookError != '' ) { # ...or the hook could be expecting us to produce an error wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_HOOK_ERROR_EXPECTED; } - if( $wgUser->isBlockedFrom( $this->mTitle, false ) ) { + if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) { # Check block state against master, thus 'false'. wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_BLOCKED_PAGE_FOR_USER; } $this->kblength = (int)(strlen( $this->textbox1 ) / 1024); - if( $this->kblength > $wgMaxArticleSize ) { + if ( $this->kblength > $wgMaxArticleSize ) { // Error will be displayed by showEditForm() $this->tooBig = true; wfProfileOut( "$fname-checks" ); @@ -806,8 +826,8 @@ class EditPage { return self::AS_CONTENT_TOO_BIG; } - if( !$wgUser->isAllowed('edit') ) { - if( $wgUser->isAnon() ) { + if ( !$wgUser->isAllowed('edit') ) { + if ( $wgUser->isAnon() ) { wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_READ_ONLY_PAGE_ANON; @@ -819,12 +839,12 @@ class EditPage { } } - if( wfReadOnly() ) { + if ( wfReadOnly() ) { wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_READ_ONLY_PAGE; } - if( $wgUser->pingLimiter() ) { + if ( $wgUser->pingLimiter() ) { wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_RATE_LIMITED; @@ -832,7 +852,7 @@ class EditPage { # If the article has been deleted while editing, don't save it without # confirmation - if( $this->wasDeletedSinceLastEdit() && !$this->recreate ) { + if ( $this->wasDeletedSinceLastEdit() && !$this->recreate ) { wfProfileOut( "$fname-checks" ); wfProfileOut( $fname ); return self::AS_ARTICLE_WAS_DELETED; @@ -842,32 +862,40 @@ class EditPage { # If article is new, insert it. $aid = $this->mTitle->getArticleID( GAID_FOR_UPDATE ); - if( 0 == $aid ) { - + if ( 0 == $aid ) { // Late check for create permission, just in case *PARANOIA* - if( !$this->mTitle->userCan( 'create' ) ) { + if ( !$this->mTitle->userCan( 'create' ) ) { wfDebug( "$fname: no create permission\n" ); wfProfileOut( $fname ); return self::AS_NO_CREATE_PERMISSION; } # Don't save a new article if it's blank. - if( '' == $this->textbox1 ) { - wfProfileOut( $fname ); - return self::AS_BLANK_ARTICLE; + if ( '' == $this->textbox1 ) { + wfProfileOut( $fname ); + return self::AS_BLANK_ARTICLE; } // Run post-section-merge edit filter - if( !wfRunHooks( 'EditFilterMerged', array( $this, $this->textbox1, &$this->hookError, $this->summary ) ) ) { + if ( !wfRunHooks( 'EditFilterMerged', array( $this, $this->textbox1, &$this->hookError, $this->summary ) ) ) { # Error messages etc. could be handled within the hook... wfProfileOut( $fname ); return self::AS_HOOK_ERROR; } + + # Handle the user preference to force summaries here. Check if it's not a redirect. + if ( !$this->allowBlankSummary && !Title::newFromRedirect( $this->textbox1 ) ) { + if ( md5( $this->summary ) == $this->autoSumm ) { + $this->missingSummary = true; + wfProfileOut( $fname ); + return self::AS_SUMMARY_NEEDED; + } + } $isComment = ( $this->section == 'new' ); $this->mArticle->insertNewArticle( $this->textbox1, $this->summary, - $this->minoredit, $this->watchthis, false, $isComment, $bot); + $this->minoredit, $this->watchthis, false, $isComment, $bot ); wfProfileOut( $fname ); return self::AS_SUCCESS_NEW_ARTICLE; @@ -880,10 +908,10 @@ class EditPage { wfDebug("timestamp: {$this->mArticle->getTimestamp()}, edittime: {$this->edittime}\n"); - if( $this->mArticle->getTimestamp() != $this->edittime ) { + if ( $this->mArticle->getTimestamp() != $this->edittime ) { $this->isConflict = true; - if( $this->section == 'new' ) { - if( $this->mArticle->getUserText() == $wgUser->getName() && + if ( $this->section == 'new' ) { + if ( $this->mArticle->getUserText() == $wgUser->getName() && $this->mArticle->getComment() == $this->summary ) { // Probably a duplicate submission of a new comment. // This can happen when squid resends a request after @@ -897,43 +925,39 @@ class EditPage { } } $userid = $wgUser->getId(); + + # Suppress edit conflict with self, except for section edits where merging is required. + if ( $this->isConflict && $this->section == '' && $this->userWasLastToEdit($userid,$this->edittime) ) { + wfDebug( "EditPage::editForm Suppressing edit conflict, same user.\n" ); + $this->isConflict = false; + } - if( $this->isConflict ) { + if ( $this->isConflict ) { wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime' (article time '" . $this->mArticle->getTimestamp() . "')\n" ); - $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary, $this->edittime); - } - else { + $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary, $this->edittime ); + } else { wfDebug( "EditPage::editForm getting section '$this->section'\n" ); - $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary); + $text = $this->mArticle->replaceSection( $this->section, $this->textbox1, $this->summary ); } - if( is_null( $text ) ) { + if ( is_null( $text ) ) { wfDebug( "EditPage::editForm activating conflict; section replace failed.\n" ); $this->isConflict = true; - $text = $this->textbox1; - } - - # Suppress edit conflict with self, except for section edits where merging is required. - if( ( $this->section == '' ) && ( 0 != $userid ) && ( $this->mArticle->getUser() == $userid ) ) { - wfDebug( "EditPage::editForm Suppressing edit conflict, same user.\n" ); - $this->isConflict = false; - } else { - # switch from section editing to normal editing in edit conflict - if( $this->isConflict ) { - # Attempt merge - if( $this->mergeChangesInto( $text ) ) { - // Successful merge! Maybe we should tell the user the good news? - $this->isConflict = false; - wfDebug( "EditPage::editForm Suppressing edit conflict, successful merge.\n" ); - } else { - $this->section = ''; - $this->textbox1 = $text; - wfDebug( "EditPage::editForm Keeping edit conflict, failed merge.\n" ); - } + $text = $this->textbox1; // do not try to merge here! + } else if ( $this->isConflict ) { + # Attempt merge + if ( $this->mergeChangesInto( $text ) ) { + // Successful merge! Maybe we should tell the user the good news? + $this->isConflict = false; + wfDebug( "EditPage::editForm Suppressing edit conflict, successful merge.\n" ); + } else { + $this->section = ''; + $this->textbox1 = $text; + wfDebug( "EditPage::editForm Keeping edit conflict, failed merge.\n" ); } } - if( $this->isConflict ) { + if ( $this->isConflict ) { wfProfileOut( $fname ); return self::AS_CONFLICT_DETECTED; } @@ -941,19 +965,17 @@ class EditPage { $oldtext = $this->mArticle->getContent(); // Run post-section-merge edit filter - if( !wfRunHooks( 'EditFilterMerged', array( $this, $text, &$this->hookError, $this->summary ) ) ) { + if ( !wfRunHooks( 'EditFilterMerged', array( $this, $text, &$this->hookError, $this->summary ) ) ) { # Error messages etc. could be handled within the hook... wfProfileOut( $fname ); return self::AS_HOOK_ERROR; } # Handle the user preference to force summaries here, but not for null edits - if( $this->section != 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary') && - 0 != strcmp($oldtext, $text) && - !is_object( Title::newFromRedirect( $text ) ) # check if it's not a redirect - ) { - - if( md5( $this->summary ) == $this->autoSumm ) { + if ( $this->section != 'new' && !$this->allowBlankSummary && 0 != strcmp($oldtext,$text) + && !Title::newFromRedirect( $text ) ) # check if it's not a redirect + { + if ( md5( $this->summary ) == $this->autoSumm ) { $this->missingSummary = true; wfProfileOut( $fname ); return self::AS_SUMMARY_NEEDED; @@ -961,8 +983,8 @@ class EditPage { } # And a similar thing for new sections - if( $this->section == 'new' && !$this->allowBlankSummary && $wgUser->getOption( 'forceeditsummary' ) ) { - if(trim($this->summary) == '') { + if ( $this->section == 'new' && !$this->allowBlankSummary ) { + if (trim($this->summary) == '') { $this->missingSummary = true; wfProfileOut( $fname ); return self::AS_SUMMARY_NEEDED; @@ -972,26 +994,26 @@ class EditPage { # All's well wfProfileIn( "$fname-sectionanchor" ); $sectionanchor = ''; - if( $this->section == 'new' ) { - if( $this->textbox1 == '' ) { + if ( $this->section == 'new' ) { + if ( $this->textbox1 == '' ) { $this->missingComment = true; return self::AS_TEXTBOX_EMPTY; } - if( $this->summary != '' ) { + if ( $this->summary != '' ) { $sectionanchor = $wgParser->guessSectionNameFromWikiText( $this->summary ); # This is a new section, so create a link to the new section # in the revision summary. $cleanSummary = $wgParser->stripSectionName( $this->summary ); $this->summary = wfMsgForContent( 'newsectionsummary', $cleanSummary ); } - } elseif( $this->section != '' ) { + } elseif ( $this->section != '' ) { # Try to get a section anchor from the section source, redirect to edited section if header found # XXX: might be better to integrate this into Article::replaceSection # for duplicate heading checking and maybe parsing $hasmatch = preg_match( "/^ *([=]{1,6})(.*?)(\\1) *\\n/i", $this->textbox1, $matches ); # we can't deal with anchors, includes, html etc in the header for now, # headline would need to be parsed to improve this - if( $hasmatch and strlen($matches[2]) > 0 ) { + if ( $hasmatch and strlen($matches[2]) > 0 ) { $sectionanchor = $wgParser->guessSectionNameFromWikiText( $matches[2] ); } } @@ -1006,15 +1028,16 @@ class EditPage { // Check for length errors again now that the section is merged in $this->kblength = (int)(strlen( $text ) / 1024); - if( $this->kblength > $wgMaxArticleSize ) { + if ( $this->kblength > $wgMaxArticleSize ) { $this->tooBig = true; wfProfileOut( $fname ); return self::AS_MAX_ARTICLE_SIZE_EXCEEDED; } # update the article here - if( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit, - $this->watchthis, $bot, $sectionanchor ) ) { + if ( $this->mArticle->updateArticle( $text, $this->summary, $this->minoredit, + $this->watchthis, $bot, $sectionanchor ) ) + { wfProfileOut( $fname ); return self::AS_SUCCESS_UPDATE; } else { @@ -1024,20 +1047,56 @@ class EditPage { return self::AS_END; } + /** + * Check if no edits were made by other users since + * the time a user started editing the page. Limit to + * 50 revisions for the sake of performance. + */ + protected function userWasLastToEdit( $id, $edittime ) { + if( !$id ) return false; + $dbw = wfGetDB( DB_MASTER ); + $res = $dbw->select( 'revision', + 'rev_user', + array( + 'rev_page' => $this->mArticle->getId(), + 'rev_timestamp > '.$dbw->addQuotes( $dbw->timestamp($edittime) ) + ), + __METHOD__, + array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 50 ) ); + while( $row = $res->fetchObject() ) { + if( $row->rev_user != $id ) { + return false; + } + } + return true; + } + /** * Check given input text against $wgSpamRegex, and return the text of the first match. * @return mixed -- matching string or false */ public static function matchSpamRegex( $text ) { global $wgSpamRegex; - if( $wgSpamRegex ) { - // For back compatibility, $wgSpamRegex may be a single string or an array of regexes. - $regexes = (array)$wgSpamRegex; - foreach( $regexes as $regex ) { - $matches = array(); - if( preg_match( $regex, $text, $matches ) ) { - return $matches[0]; - } + // For back compatibility, $wgSpamRegex may be a single string or an array of regexes. + $regexes = (array)$wgSpamRegex; + return self::matchSpamRegexInternal( $text, $regexes ); + } + + /** + * Check given input text against $wgSpamRegex, and return the text of the first match. + * @return mixed -- matching string or false + */ + public static function matchSummarySpamRegex( $text ) { + global $wgSummarySpamRegex; + $regexes = (array)$wgSummarySpamRegex; + return self::matchSpamRegexInternal( $text, $regexes ); + } + + protected static function matchSpamRegexInternal( $text, $regexes ) { + foreach( $regexes as $regex ) { + $matches = array(); + if( preg_match( $regex, $text, $matches ) ) { + return $matches[0]; } } return false; @@ -1049,11 +1108,8 @@ class EditPage { */ function initialiseForm() { $this->edittime = $this->mArticle->getTimestamp(); - $this->textbox1 = $this->getContent(false); - if( $this->textbox1 === false) return false; - - if( !$this->mArticle->exists() && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) - $this->textbox1 = wfMsgWeirdKey( $this->mTitle->getText() ); + $this->textbox1 = $this->getContent( false ); + if ( $this->textbox1 === false ) return false; wfProxyCheck(); return true; } @@ -1061,17 +1117,17 @@ class EditPage { function setHeaders() { global $wgOut, $wgTitle; $wgOut->setRobotPolicy( 'noindex,nofollow' ); - if( $this->formtype == 'preview' ) { + if ( $this->formtype == 'preview' ) { $wgOut->setPageTitleActionText( wfMsg( 'preview' ) ); } - if( $this->isConflict ) { + if ( $this->isConflict ) { $wgOut->setPageTitle( wfMsg( 'editconflict', $wgTitle->getPrefixedText() ) ); - } elseif( $this->section != '' ) { + } elseif ( $this->section != '' ) { $msg = $this->section == 'new' ? 'editingcomment' : 'editingsection'; $wgOut->setPageTitle( wfMsg( $msg, $wgTitle->getPrefixedText() ) ); } else { # Use the title defined by DISPLAYTITLE magic word when present - if( isset($this->mParserOutput) + if ( isset($this->mParserOutput) && ( $dt = $this->mParserOutput->getDisplayTitle() ) !== false ) { $title = $dt; } else { @@ -1088,13 +1144,13 @@ class EditPage { * near the top, for captchas and the like. */ function showEditForm( $formCallback=null ) { - global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize, $wgTitle; + global $wgOut, $wgUser, $wgLang, $wgContLang, $wgMaxArticleSize, $wgTitle, $wgRequest; # If $wgTitle is null, that means we're in API mode. # Some hook probably called this function without checking # for is_null($wgTitle) first. Bail out right here so we don't # do lots of work just to discard it right after. - if(is_null($wgTitle)) + if (is_null($wgTitle)) return; $fname = 'EditPage::showEditForm'; @@ -1102,36 +1158,34 @@ class EditPage { $sk = $wgUser->getSkin(); - wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) ) ; - #need to parse the preview early so that we know which templates are used, #otherwise users with "show preview after edit box" will get a blank list #we parse this near the beginning so that setHeaders can do the title #setting work instead of leaving it in getPreviewText $previewOutput = ''; - if( $this->formtype == 'preview' ) { + if ( $this->formtype == 'preview' ) { $previewOutput = $this->getPreviewText(); } + + wfRunHooks( 'EditPage::showEditForm:initial', array( &$this ) ) ; $this->setHeaders(); # Enabled article-related sidebar, toplinks, etc. $wgOut->setArticleRelated( true ); - if( $this->isConflict ) { - $wgOut->addWikiMsg( 'explainconflict' ); + if ( $this->isConflict ) { + $wgOut->wrapWikiMsg( "
\n$1
", 'explainconflict' ); $this->textbox2 = $this->textbox1; $this->textbox1 = $this->getContent(); $this->edittime = $this->mArticle->getTimestamp(); } else { - if( $this->section != '' && $this->section != 'new' ) { + if ( $this->section != '' && $this->section != 'new' ) { $matches = array(); - if( !$this->summary && !$this->preview && !$this->diff ) { - preg_match( "/^(=+)(.+)\\1/mi", - $this->textbox1, - $matches ); - if( !empty( $matches[2] ) ) { + if ( !$this->summary && !$this->preview && !$this->diff ) { + preg_match( "/^(=+)(.+)\\1/mi", $this->textbox1, $matches ); + if ( !empty( $matches[2] ) ) { global $wgParser; $this->summary = "/* " . $wgParser->stripSectionName(trim($matches[2])) . @@ -1140,118 +1194,126 @@ class EditPage { } } - if( $this->missingComment ) { - $wgOut->wrapWikiMsg( '
$1
', 'missingcommenttext' ); + if ( $this->missingComment ) { + $wgOut->wrapWikiMsg( '
$1
', 'missingcommenttext' ); } - if( $this->missingSummary && $this->section != 'new' ) { + if ( $this->missingSummary && $this->section != 'new' ) { $wgOut->wrapWikiMsg( '
$1
', 'missingsummary' ); } - if( $this->missingSummary && $this->section == 'new' ) { + if ( $this->missingSummary && $this->section == 'new' ) { $wgOut->wrapWikiMsg( '
$1
', 'missingcommentheader' ); } - if( $this->hookError !== '' ) { + if ( $this->hookError !== '' ) { $wgOut->addWikiText( $this->hookError ); } - if( !$this->checkUnicodeCompliantBrowser() ) { + if ( !$this->checkUnicodeCompliantBrowser() ) { $wgOut->addWikiMsg( 'nonunicodebrowser' ); } - if( isset( $this->mArticle ) && isset( $this->mArticle->mRevision ) ) { + if ( isset( $this->mArticle ) && isset( $this->mArticle->mRevision ) ) { // Let sysop know that this will make private content public if saved - if( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); - } else if( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-view' ); + if ( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) { + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-permission' ); + } else if ( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-view' ); } - if( !$this->mArticle->mRevision->isCurrent() ) { + if ( !$this->mArticle->mRevision->isCurrent() ) { $this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() ); $wgOut->addWikiMsg( 'editingold' ); } } } - if( wfReadOnly() ) { + if ( wfReadOnly() ) { $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'readonlywarning', wfReadOnlyReason() ) ); - } elseif( $wgUser->isAnon() && $this->formtype != 'preview' ) { + } elseif ( $wgUser->isAnon() && $this->formtype != 'preview' ) { $wgOut->wrapWikiMsg( '
$1
', 'anoneditwarning' ); } else { - if( $this->isCssJsSubpage && $this->formtype != 'preview' ) { + if ( $this->isCssJsSubpage ) { # Check the skin exists - if( $this->isValidCssJsSubpage ) { - $wgOut->addWikiMsg( 'usercssjsyoucanpreview' ); + if ( $this->isValidCssJsSubpage ) { + if ( $this->formtype !== 'preview' ) { + $wgOut->addWikiMsg( 'usercssjsyoucanpreview' ); + } } else { $wgOut->addWikiMsg( 'userinvalidcssjstitle', $wgTitle->getSkinFromCssJsSubpage() ); } } } - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { - # Show a warning if editing an interface message - $wgOut->addWikiMsg( 'editinginterface' ); - } elseif( $this->mTitle->isProtected( 'edit' ) ) { + $classes = array(); // Textarea CSS + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + } elseif ( $this->mTitle->isProtected( 'edit' ) ) { # Is the title semi-protected? - if( $this->mTitle->isSemiProtected() ) { + if ( $this->mTitle->isSemiProtected() ) { $noticeMsg = 'semiprotectedpagewarning'; + $classes[] = 'mw-textarea-sprotected'; } else { # Then it must be protected based on static groups (regular) $noticeMsg = 'protectedpagewarning'; + $classes[] = 'mw-textarea-protected'; } - $wgOut->addHTML( "
\n" ); + $wgOut->addHTML( "
\n" ); $wgOut->addWikiMsg( $noticeMsg ); LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle->getPrefixedText(), '', 1 ); $wgOut->addHTML( "
\n" ); } - if( $this->mTitle->isCascadeProtected() ) { + if ( $this->mTitle->isCascadeProtected() ) { # Is this page under cascading protection from some source pages? list($cascadeSources, /* $restrictions */) = $this->mTitle->getCascadeProtectionSources(); - $notice = "$1\n"; - if( count($cascadeSources) > 0 ) { + $notice = "
$1\n"; + $cascadeSourcesCount = count( $cascadeSources ); + if ( $cascadeSourcesCount > 0 ) { # Explain, and list the titles responsible foreach( $cascadeSources as $page ) { $notice .= '* [[:' . $page->getPrefixedText() . "]]\n"; } } - $wgOut->wrapWikiMsg( $notice, array( 'cascadeprotectedwarning', count($cascadeSources) ) ); + $notice .= '
'; + $wgOut->wrapWikiMsg( $notice, array( 'cascadeprotectedwarning', $cascadeSourcesCount ) ); } - if( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) != array() ){ - $wgOut->addWikiMsg( 'titleprotectedwarning' ); + if ( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) ) { + $wgOut->wrapWikiMsg( '
$1
', 'titleprotectedwarning' ); } - if( $this->kblength === false ) { + if ( $this->kblength === false ) { $this->kblength = (int)(strlen( $this->textbox1 ) / 1024); } - if( $this->tooBig || $this->kblength > $wgMaxArticleSize ) { - $wgOut->addHTML( "
\n" ); + if ( $this->tooBig || $this->kblength > $wgMaxArticleSize ) { + $wgOut->addHTML( "
\n" ); $wgOut->addWikiMsg( 'longpageerror', $wgLang->formatNum( $this->kblength ), $wgLang->formatNum( $wgMaxArticleSize ) ); $wgOut->addHTML( "
\n" ); - } elseif( $this->kblength > 29 ) { + } elseif ( $this->kblength > 29 ) { $wgOut->addHTML( "
\n" ); $wgOut->addWikiMsg( 'longpagewarning', $wgLang->formatNum( $this->kblength ) ); $wgOut->addHTML( "
\n" ); } - $q = 'action='.$this->action; - #if( "no" == $redirect ) { $q .= "&redirect=no"; } - $action = $wgTitle->escapeLocalURL( $q ); + $action = $wgTitle->escapeLocalURL( array( 'action' => $this->action ) ); - $colonSep = wfMsg( 'colon-separator' ); - $summary = wfMsg( 'summary' ) . $colonSep; - $subject = wfMsg( 'subject' ) . $colonSep; + $summary = wfMsgExt( 'summary', 'parseinline' ); + $subject = wfMsgExt( 'subject', 'parseinline' ); - $cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(), - wfMsgExt('cancel', array('parseinline')) ); + $cancel = $sk->link( + $wgTitle, + wfMsgExt( 'cancel', array( 'parseinline' ) ), + array(), + array(), + array( 'known', 'noclasses' ) + ); + $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); $edithelpurl = Skin::makeInternalOrExternalUrl( wfMsgForContent( 'edithelppage' )); $edithelp = ''. htmlspecialchars( wfMsg( 'edithelp' ) ).' '. htmlspecialchars( wfMsg( 'newwindow' ) ); global $wgRightsText; - if( $wgRightsText ) { + if ( $wgRightsText ) { $copywarnMsg = array( 'copyrightwarning', '[[' . wfMsgForContent( 'copyrightpage' ) . ']]', $wgRightsText ); @@ -1259,8 +1321,10 @@ class EditPage { $copywarnMsg = array( 'copyrightwarning2', '[[' . wfMsgForContent( 'copyrightpage' ) . ']]' ); } + // Allow for site and per-namespace customization of contribution/copyright notice. + wfRunHooks( 'EditPageCopyrightWarning', array( $this->mTitle, &$copywarnMsg ) ); - if( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) { + if ( $wgUser->getOption('showtoolbar') and !$this->isCssJsSubpage ) { # prepare toolbar for edit buttons $toolbar = EditPage::getEditToolbar(); } else { @@ -1268,25 +1332,30 @@ class EditPage { } // activate checkboxes if user wants them to be always active - if( !$this->preview && !$this->diff ) { + if ( !$this->preview && !$this->diff ) { # Sort out the "watch" checkbox - if( $wgUser->getOption( 'watchdefault' ) ) { + if ( $wgUser->getOption( 'watchdefault' ) ) { # Watch all edits $this->watchthis = true; - } elseif( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) { + } elseif ( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) { # Watch creations $this->watchthis = true; - } elseif( $this->mTitle->userIsWatching() ) { + } elseif ( $this->mTitle->userIsWatching() ) { # Already watched $this->watchthis = true; } + + # May be overriden by request parameters + if( $wgRequest->getBool( 'watchthis' ) ) { + $this->watchthis = true; + } - if( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true; + if ( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true; } $wgOut->addHTML( $this->editFormPageTop ); - if( $wgUser->getOption( 'previewontop' ) ) { + if ( $wgUser->getOption( 'previewontop' ) ) { $this->displayPreviewArea( $previewOutput, true ); } @@ -1295,7 +1364,7 @@ class EditPage { # if this is a comment, show a subject line at the top, which is also the edit summary. # Otherwise, show a summary field at the bottom - $summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME + $summarytext = $wgContLang->recodeForEdit( $this->summary ); # If a blank edit summary was previously provided, and the appropriate # user preference is active, pass a hidden tag as wpIgnoreBlankSummary. This will stop the @@ -1305,25 +1374,74 @@ class EditPage { # For a bit more sophisticated detection of blank summaries, hash the # automatic one and pass that in the hidden field wpAutoSummary. $summaryhiddens = ''; - if( $this->missingSummary ) $summaryhiddens .= Xml::hidden( 'wpIgnoreBlankSummary', true ); + if ( $this->missingSummary ) $summaryhiddens .= Xml::hidden( 'wpIgnoreBlankSummary', true ); $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); $summaryhiddens .= Xml::hidden( 'wpAutoSummary', $autosumm ); - if( $this->section == 'new' ) { - $commentsubject="\n{$summaryhiddens}
"; + if ( $this->section == 'new' ) { + $commentsubject = ''; + if ( !$wgRequest->getBool( 'nosummary' ) ) { + # Add a class if 'missingsummary' is triggered to allow styling of the summary line + $summaryClass = $this->missingSummary ? 'mw-summarymissed' : 'mw-summary'; + + $commentsubject = + Xml::tags( 'label', array( 'for' => 'wpSummary' ), $subject ); + $commentsubject = + Xml::tags( 'span', array( 'class' => $summaryClass, 'id' => "wpSummaryLabel" ), + $commentsubject ); + $commentsubject .= ' '; + $commentsubject .= Xml::input( 'wpSummary', + 60, + $summarytext, + array( + 'id' => 'wpSummary', + 'maxlength' => '200', + 'tabindex' => '1' + ) ); + } $editsummary = "
\n"; global $wgParser; $formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) ); - $subjectpreview = $summarytext && $this->preview ? "
".wfMsg('subject-preview').$colonSep.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."
\n" : ''; + $subjectpreview = $summarytext && $this->preview ? + "
". wfMsgExt('subject-preview', 'parseinline') . $sk->commentBlock( $formattedSummary, $this->mTitle, true )."
\n" : ''; $summarypreview = ''; } else { $commentsubject = ''; - $editsummary="
\n\n{$summaryhiddens}
"; - $summarypreview = $summarytext && $this->preview ? "
".wfMsg('summary-preview').$colonSep.$sk->commentBlock( $this->summary, $this->mTitle )."
\n" : ''; + + # Add a class if 'missingsummary' is triggered to allow styling of the summary line + $summaryClass = $this->missingSummary ? 'mw-summarymissed' : 'mw-summary'; + + $editsummary = Xml::tags( 'label', array( 'for' => 'wpSummary' ), $summary ); + $editsummary = Xml::tags( 'span', array( 'class' => $summaryClass, 'id' => "wpSummaryLabel" ), + $editsummary ) . ' '; + + $editsummary .= Xml::input( 'wpSummary', + 60, + $summarytext, + array( + 'id' => 'wpSummary', + 'maxlength' => '200', + 'tabindex' => '1' + ) ); + + // No idea where this is closed. + $editsummary = Xml::openElement( 'div', array( 'class' => 'editOptions' ) ) + . $editsummary . '
'; + + $summarypreview = ''; + if ( $summarytext && $this->preview ) { + $summarypreview = + Xml::tags( 'div', + array( 'class' => 'mw-summary-preview' ), + wfMsgExt( 'summary-preview', 'parseinline' ) . + $sk->commentBlock( $this->summary, $this->mTitle ) + ); + } $subjectpreview = ''; } + $commentsubject .= $summaryhiddens; # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display - if( !$this->preview && !$this->diff ) { + if ( !$this->preview && !$this->diff ) { $wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' ); } $templates = $this->getTemplates(); @@ -1333,37 +1451,41 @@ class EditPage { $formattedhiddencats = $sk->formatHiddenCategories( $hiddencats ); global $wgUseMetadataEdit ; - if( $wgUseMetadataEdit ) { + if ( $wgUseMetadataEdit ) { $metadata = $this->mMetaData ; $metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ; $top = wfMsgWikiHtml( 'metadata_help' ); /* ToDo: Replace with clean code */ $ew = $wgUser->getOption( 'editwidth' ); - if( $ew ) $ew = " style=\"width:100%\""; + if ( $ew ) $ew = " style=\"width:100%\""; else $ew = ''; + $cols = $wgUser->getIntOption( 'cols' ); /* /ToDo */ $metadata = $top . "" ; } else $metadata = "" ; $recreate = ''; - if( $this->wasDeletedSinceLastEdit() ) { - if( 'save' != $this->formtype ) { - $wgOut->addWikiMsg('deletedwhileediting'); + if ( $this->wasDeletedSinceLastEdit() ) { + if ( 'save' != $this->formtype ) { + $wgOut->wrapWikiMsg( + "
\n$1
", + 'deletedwhileediting' ); } else { - // Hide the toolbar and edit area, use can click preview to get it back + // Hide the toolbar and edit area, user can click preview to get it back // Add an confirmation checkbox and explanation. $toolbar = ''; - $recreate = $wgOut->parse( wfMsg( 'confirmrecreate', $this->lastDelete->user_name , $this->lastDelete->log_comment )); - $recreate .= - "
". - ""; + $recreate = '
' . + $wgOut->parse( wfMsg( 'confirmrecreate', $this->lastDelete->user_name , $this->lastDelete->log_comment ) ) . + Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false, + array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' ) + ) . '
'; } } $tabindex = 2; - $checkboxes = self::getCheckboxes( $tabindex, $sk, + $checkboxes = $this->getCheckboxes( $tabindex, $sk, array( 'minor' => $this->minoredit, 'watch' => $this->watchthis ) ); $checkboxhtml = implode( $checkboxes, "\n" ); @@ -1380,7 +1502,7 @@ class EditPage { END ); - if( is_callable( $formCallback ) ) { + if ( is_callable( $formCallback ) ) { call_user_func_array( $formCallback, array( &$wgOut ) ); } @@ -1396,7 +1518,7 @@ END {$this->editFormTextBeforeContent} END ); - $this->showTextbox1(); + $this->showTextbox1( $classes ); $wgOut->wrapWikiMsg( "
\n$1\n
", $copywarnMsg ); $wgOut->addHTML( <<addHTML( "
{$buttonshtml} - {$cancel} | {$edithelp} + {$cancel}{$separator}{$edithelp}
"); @@ -1431,6 +1553,7 @@ END $token = htmlspecialchars( $wgUser->editToken() ); $wgOut->addHTML( "\n\n" ); + $this->showTosSummary(); $this->showEditTools(); $wgOut->addHTML( <<isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) { + if ( $this->isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) { $wgOut->wrapWikiMsg( '==$1==', "yourdiff" ); $de = new DifferenceEngine( $this->mTitle ); @@ -1456,7 +1579,7 @@ END } $wgOut->addHTML( $this->editFormTextBottom ); $wgOut->addHTML( "\n" ); - if( !$wgUser->getOption( 'previewontop' ) ) { + if ( !$wgUser->getOption( 'previewontop' ) ) { $this->displayPreviewArea( $previewOutput, false ); } @@ -1472,11 +1595,13 @@ END scrolltop}\" name=\"wpScrolltop\" id=\"wpScrolltop\" />\n" ); } - protected function showTextbox1() { + protected function showTextbox1( $classes ) { $attribs = array( 'tabindex' => 1 ); - if( $this->wasDeletedSinceLastEdit() ) + if ( $this->wasDeletedSinceLastEdit() ) $attribs['type'] = 'hidden'; + if ( !empty($classes) ) + $attribs['class'] = implode(' ',$classes); $this->showTextbox( $this->textbox1, 'wpTextbox1', $attribs ); } @@ -1489,7 +1614,7 @@ END global $wgOut, $wgUser; $wikitext = $this->safeUnicodeOutput( $content ); - if( $wikitext !== '' ) { + if ( $wikitext !== '' ) { // Ensure there's a newline at the end, otherwise adding lines // is awkward. // But don't add a newline if the ext is empty, or Firefox in XHTML @@ -1500,7 +1625,7 @@ END $attribs['accesskey'] = ','; $attribs['id'] = $name; - if( $wgUser->getOption( 'editwidth' ) ) + if ( $wgUser->getOption( 'editwidth' ) ) $attribs['style'] = 'width: 100%'; $wgOut->addHTML( Xml::textarea( @@ -1513,23 +1638,23 @@ END protected function displayPreviewArea( $previewOutput, $isOnTop = false ) { global $wgOut; $classes = array(); - if( $isOnTop ) + if ( $isOnTop ) $classes[] = 'ontop'; $attribs = array( 'id' => 'wikiPreview', 'class' => implode( ' ', $classes ) ); - if( $this->formtype != 'preview' ) + if ( $this->formtype != 'preview' ) $attribs['style'] = 'display: none;'; $wgOut->addHTML( Xml::openElement( 'div', $attribs ) ); - if( $this->formtype == 'preview' ) { + if ( $this->formtype == 'preview' ) { $this->showPreview( $previewOutput ); } $wgOut->addHTML( '
' ); - if( $this->formtype == 'diff') { + if ( $this->formtype == 'diff') { $this->showDiff(); } } @@ -1542,14 +1667,14 @@ END */ protected function showPreview( $text ) { global $wgOut; - if( $this->mTitle->getNamespace() == NS_CATEGORY) { + if ( $this->mTitle->getNamespace() == NS_CATEGORY) { $this->mArticle->openShowCategory(); } # This hook seems slightly odd here, but makes things more # consistent for extensions. wfRunHooks( 'OutputPageBeforeHTML',array( &$wgOut, &$text ) ); $wgOut->addHTML( $text ); - if( $this->mTitle->getNamespace() == NS_CATEGORY ) { + if ( $this->mTitle->getNamespace() == NS_CATEGORY ) { $this->mArticle->closeShowCategory(); } } @@ -1567,23 +1692,44 @@ END function doLivePreviewScript() { global $wgOut, $wgTitle; $wgOut->addScriptFile( 'preview.js' ); - $liveAction = $wgTitle->getLocalUrl( "action={$this->action}&wpPreview=true&live=true" ); + $liveAction = $wgTitle->getLocalUrl( array( + 'action' => $this->action, + 'wpPreview' => 'true', + 'live' => 'true' + ) ); return "return !lpDoPreview(" . "editform.wpTextbox1.value," . '"' . $liveAction . '"' . ")"; } + protected function showTosSummary() { + $msg = 'editpage-tos-summary'; + // Give a chance for site and per-namespace customizations of + // terms of service summary link that might exist separately + // from the copyright notice. + // + // This will display between the save button and the edit tools, + // so should remain short! + wfRunHooks( 'EditPageTosSummary', array( $this->mTitle, &$msg ) ); + $text = wfMsg( $msg ); + if( !wfEmptyMsg( $msg, $text ) && $text !== '-' ) { + global $wgOut; + $wgOut->addHTML( '
' ); + $wgOut->addWikiMsgArray( $msg, array() ); + $wgOut->addHTML( '
' ); + } + } + protected function showEditTools() { global $wgOut; - $wgOut->addHtml( '
' ); + $wgOut->addHTML( '
' ); $wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) ); - $wgOut->addHtml( '
' ); + $wgOut->addHTML( '
' ); } - function getLastDelete() { + protected function getLastDelete() { $dbr = wfGetDB( DB_SLAVE ); - $fname = 'EditPage::getLastDelete'; - $res = $dbr->select( + $data = $dbr->selectRow( array( 'logging', 'user' ), array( 'log_type', 'log_action', @@ -1593,19 +1739,22 @@ END 'log_title', 'log_comment', 'log_params', - 'user_name', ), + 'log_deleted', + 'user_name' ), array( 'log_namespace' => $this->mTitle->getNamespace(), 'log_title' => $this->mTitle->getDBkey(), 'log_type' => 'delete', 'log_action' => 'delete', 'user_id=log_user' ), - $fname, - array( 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ) ); - - if( $dbr->numRows($res) ) { - $data = $dbr->fetchObject( $res ); - } else { - $data = null; + __METHOD__, + array( 'LIMIT' => 1, 'ORDER BY' => 'log_timestamp DESC' ) + ); + // Quick paranoid permission checks... + if( is_object($data) ) { + if( $data->log_deleted & LogPage::DELETED_USER ) + $data->user_name = wfMsgHtml('rev-deleted-user'); + if( $data->log_deleted & LogPage::DELETED_COMMENT ) + $data->log_comment = wfMsgHtml('rev-deleted-comment'); } return $data; } @@ -1615,12 +1764,12 @@ END * @return string */ function getPreviewText() { - global $wgOut, $wgUser, $wgTitle, $wgParser, $wgLang, $wgContLang; + global $wgOut, $wgUser, $wgTitle, $wgParser, $wgLang, $wgContLang, $wgMessageCache; wfProfileIn( __METHOD__ ); - if( $this->mTriedSave && !$this->mTokenOk ) { - if( $this->mTokenOkExceptSuffix ) { + if ( $this->mTriedSave && !$this->mTokenOk ) { + if ( $this->mTokenOkExceptSuffix ) { $note = wfMsg( 'token_suffix_mismatch' ); } else { $note = wfMsg( 'session_fail_preview' ); @@ -1631,9 +1780,11 @@ END $parserOptions = ParserOptions::newFromUser( $wgUser ); $parserOptions->setEditSection( false ); + $parserOptions->setIsPreview( true ); + $parserOptions->setIsSectionPreview( !is_null($this->section) && $this->section !== '' ); global $wgRawHtml; - if( $wgRawHtml && !$this->mTokenOk ) { + if ( $wgRawHtml && !$this->mTokenOk ) { // Could be an offsite preview attempt. This is very unsafe if // HTML is enabled, as it could be an attack. return $wgOut->parse( "
" . @@ -1643,44 +1794,33 @@ END # don't parse user css/js, show message about preview # XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here - if( $this->isCssJsSubpage ) { - if(preg_match("/\\.css$/", $this->mTitle->getText() ) ) { + if ( $this->isCssJsSubpage ) { + if (preg_match("/\\.css$/", $this->mTitle->getText() ) ) { $previewtext = wfMsg('usercsspreview'); - } else if(preg_match("/\\.js$/", $this->mTitle->getText() ) ) { + } else if (preg_match("/\\.js$/", $this->mTitle->getText() ) ) { $previewtext = wfMsg('userjspreview'); } $parserOptions->setTidy(true); - $parserOutput = $wgParser->parse( $previewtext , $this->mTitle, $parserOptions ); - //$wgOut->addHTML( $parserOutput->mText ); - $previewHTML = ''; - } elseif( $rt = Title::newFromRedirect( $this->textbox1 ) ) { + $parserOutput = $wgParser->parse( $previewtext, $this->mTitle, $parserOptions ); + $previewHTML = $parserOutput->mText; + } elseif ( $rt = Title::newFromRedirectArray( $this->textbox1 ) ) { $previewHTML = $this->mArticle->viewRedirect( $rt, false ); } else { $toparse = $this->textbox1; # If we're adding a comment, we need to show the # summary as the headline - if( $this->section=="new" && $this->summary!="" ) { + 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; // Parse mediawiki messages with correct target language - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { - $pos = strrpos( $this->mTitle->getText(), '/' ); - if( $pos !== false ) { - $code = substr( $this->mTitle->getText(), $pos+1 ); - switch ($code) { - case $wgLang->getCode(): - $obj = $wgLang; break; - case $wgContLang->getCode(): - $obj = $wgContLang; break; - default: - $obj = Language::factory( $code ); - } - $parserOptions->setTargetLanguage( $obj ); - } + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + list( /* $unused */, $lang ) = $wgMessageCache->figureMessage( $this->mTitle->getText() ); + $obj = wfGetLangObj( $lang ); + $parserOptions->setTargetLanguage( $obj ); } @@ -1693,25 +1833,29 @@ END $this->mParserOutput = $parserOutput; $wgOut->addParserOutputNoText( $parserOutput ); - if( count( $parserOutput->getWarnings() ) ) { + if ( count( $parserOutput->getWarnings() ) ) { $note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() ); } } - $previewhead = '

' . htmlspecialchars( wfMsg( 'preview' ) ) . "

\n" . - "
" . $wgOut->parse( $note ) . "
\n"; if( $this->isConflict ) { - $previewhead .='

' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "

\n"; + $conflict = '

' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "

\n"; + } else { + $conflict = '
'; } + $previewhead = "
\n" . + '

' . htmlspecialchars( wfMsg( 'preview' ) ) . "

" . + $wgOut->parse( $note ) . $conflict . "
\n"; + wfProfileOut( __METHOD__ ); return $previewhead . $previewHTML; } function getTemplates() { - if( $this->preview || $this->section != '' ) { + if ( $this->preview || $this->section != '' ) { $templates = array(); - if( !isset($this->mParserOutput) ) return $templates; + if ( !isset($this->mParserOutput) ) return $templates; foreach( $this->mParserOutput->getTemplates() as $ns => $template) { foreach( array_keys( $template ) as $dbk ) { $templates[] = Title::makeTitle($ns, $dbk); @@ -1733,22 +1877,22 @@ END # If the user made changes, preserve them when showing the markup # (This happens when a user is blocked during edit, for instance) $first = $this->firsttime || ( !$this->save && $this->textbox1 == '' ); - if( $first ) { + if ( $first ) { $source = $this->mTitle->exists() ? $this->getContent() : false; } else { $source = $this->textbox1; } # Spit out the source or the user's modified version - if( $source !== false ) { + if ( $source !== false ) { $rows = $wgUser->getIntOption( 'rows' ); $cols = $wgUser->getIntOption( 'cols' ); $attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' ); - $wgOut->addHtml( '
' ); + $wgOut->addHTML( '
' ); $wgOut->addWikiMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ); # Why we don't use Xml::element here? # Is it because if $source is '', it returns