";
$editsummary = '';
- $subjectpreview = $summarytext && $this->preview ? "
".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->dbTitle )."
".wfMsg('subject-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."
\n" : '';
$summarypreview = '';
} else {
$commentsubject = '';
$editsummary="
\n
";
- $summarypreview = $summarytext && $this->preview ? "
".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->dbTitle )."
\n" : '';
+ $summarypreview = $summarytext && $this->preview ? "
".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."
\n" : '';
$subjectpreview = '';
}
@@ -1305,12 +1363,12 @@ END
if ( $this->isConflict ) {
$wgOut->addWikiText( '==' . wfMsg( "yourdiff" ) . '==' );
- $de = new DifferenceEngine( $this->dbTitle );
+ $de = new DifferenceEngine( $this->mTitle );
$de->setText( $this->textbox2, $this->textbox1 );
$de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
$wgOut->addWikiText( '==' . wfMsg( "yourtext" ) . '==' );
- $wgOut->addHTML( "
" );
}
$wgOut->addHTML( $this->editFormTextBottom );
@@ -1342,12 +1400,12 @@ END
global $wgOut;
$wgOut->addHTML( '
' );
- if($this->dbTitle->getNamespace() == NS_CATEGORY) {
+ if($this->mTitle->getNamespace() == NS_CATEGORY) {
$this->mArticle->openShowCategory();
}
wfRunHooks( 'OutputPageBeforeHTML',array( &$wgOut, &$text ) );
$wgOut->addHTML( $text );
- if($this->dbTitle->getNamespace() == NS_CATEGORY) {
+ if($this->mTitle->getNamespace() == NS_CATEGORY) {
$this->mArticle->closeShowCategory();
}
$wgOut->addHTML( '
' );
@@ -1368,7 +1426,7 @@ END
$wgOut->addHTML( '' . "\n" );
- $liveAction = $this->uiTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
+ $liveAction = $wgTitle->getLocalUrl( 'action=submit&wpPreview=true&live=true' );
return "return !lpDoPreview(" .
"editform.wpTextbox1.value," .
'"' . $liveAction . '"' . ")";
@@ -1388,8 +1446,8 @@ END
'log_comment',
'log_params',
'user_name', ),
- array( 'log_namespace' => $this->dbTitle->getNamespace(),
- 'log_title' => $this->dbTitle->getDBkey(),
+ array( 'log_namespace' => $this->mTitle->getNamespace(),
+ 'log_title' => $this->mTitle->getDBkey(),
'log_type' => 'delete',
'log_action' => 'delete',
'user_id=log_user' ),
@@ -1417,17 +1475,12 @@ END
if ( $this->mTriedSave && !$this->mTokenOk ) {
if ( $this->mTokenOkExceptSuffix ) {
- $msg = 'token_suffix_mismatch';
+ $note = wfMsg( 'token_suffix_mismatch' );
} else {
- $msg = 'session_fail_preview';
+ $note = wfMsg( 'session_fail_preview' );
}
} else {
- $msg = 'previewnote';
- }
- $previewhead = '
' . htmlspecialchars( wfMsg( 'preview' ) ) . "
\n" .
- "
" . $wgOut->parse( wfMsg( $msg ) ) . "
\n";
- if ( $this->isConflict ) {
- $previewhead.='
' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "
\n";
+ $note = wfMsg( 'previewnote' );
}
$parserOptions = ParserOptions::newFromUser( $wgUser );
@@ -1445,16 +1498,15 @@ END
# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
if ( $this->isCssJsSubpage ) {
- if(preg_match("/\\.css$/", $this->dbTitle->getText() ) ) {
+ if(preg_match("/\\.css$/", $this->mTitle->getText() ) ) {
$previewtext = wfMsg('usercsspreview');
- } else if(preg_match("/\\.js$/", $this->dbTitle->getText() ) ) {
+ } else if(preg_match("/\\.js$/", $this->mTitle->getText() ) ) {
$previewtext = wfMsg('userjspreview');
}
$parserOptions->setTidy(true);
- $parserOutput = $wgParser->parse( $previewtext , $this->dbTitle, $parserOptions );
+ $parserOutput = $wgParser->parse( $previewtext , $this->mTitle, $parserOptions );
$wgOut->addHTML( $parserOutput->mText );
- wfProfileOut( $fname );
- return $previewhead;
+ $previewHTML = '';
} else {
$toparse = $this->textbox1;
@@ -1466,22 +1518,38 @@ END
if ( $this->mMetaData != "" ) $toparse .= "\n" . $this->mMetaData ;
$parserOptions->setTidy(true);
+ $parserOptions->enableLimitReport();
$parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $toparse ) ."\n\n",
- $this->dbTitle, $parserOptions );
+ $this->mTitle, $parserOptions );
$previewHTML = $parserOutput->getText();
$wgOut->addParserOutputNoText( $parserOutput );
# ParserOutput might have altered the page title, so reset it
- $wgOut->setPageTitle( wfMsg( 'editing', $this->uiTitle->getPrefixedText() ) );
+ # Also, use the title defined by DISPLAYTITLE magic word when present
+ if( ( $dt = $parserOutput->getDisplayTitle() ) !== false ) {
+ $wgOut->setPageTitle( wfMsg( 'editing', $dt ) );
+ } else {
+ $wgOut->setPageTitle( wfMsg( 'editing', $wgTitle->getPrefixedText() ) );
+ }
foreach ( $parserOutput->getTemplates() as $ns => $template)
foreach ( array_keys( $template ) as $dbk)
$this->mPreviewTemplates[] = Title::makeTitle($ns, $dbk);
- wfProfileOut( $fname );
- return $previewhead . $previewHTML;
+ 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";
+ }
+
+ wfProfileOut( $fname );
+ return $previewhead . $previewHTML;
}
/**
@@ -1495,7 +1563,7 @@ END
# (This happens when a user is blocked during edit, for instance)
$first = $this->firsttime || ( !$this->save && $this->textbox1 == '' );
if( $first ) {
- $source = $this->dbTitle->exists() ? $this->getContent() : false;
+ $source = $this->mTitle->exists() ? $this->getContent() : false;
} else {
$source = $this->textbox1;
}
@@ -1506,7 +1574,7 @@ END
$cols = $wgUser->getOption( 'cols' );
$attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' );
$wgOut->addHtml( '
' );
- $wgOut->addWikiText( wfMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->dbTitle->getPrefixedText() ) );
+ $wgOut->addWikiText( wfMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() ) );
$wgOut->addHtml( wfOpenElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . wfCloseElement( 'textarea' ) );
}
}
@@ -1515,18 +1583,18 @@ END
* Produce the stock "please login to edit pages" page
*/
function userNotLoggedInPage() {
- global $wgUser, $wgOut;
+ global $wgUser, $wgOut, $wgTitle;
$skin = $wgUser->getSkin();
$loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
- $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $this->uiTitle->getPrefixedUrl() );
+ $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() );
$wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
- $wgOut->returnToMain( false, $this->uiTitle );
+ $wgOut->returnToMain( false, $wgTitle );
}
/**
@@ -1534,14 +1602,14 @@ END
* they have attempted to edit a nonexistant section.
*/
function noSuchSectionPage() {
- global $wgOut;
+ global $wgOut, $wgTitle;
$wgOut->setPageTitle( wfMsg( 'nosuchsectiontitle' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
$wgOut->addWikiText( wfMsg( 'nosuchsectiontext', $this->section ) );
- $wgOut->returnToMain( false, $this->uiTitle );
+ $wgOut->returnToMain( false, $wgTitle );
}
/**
@@ -1550,17 +1618,19 @@ END
* @param $match Text which triggered one or more filters
*/
function spamPage( $match = false ) {
- global $wgOut;
+ global $wgOut, $wgTitle;
$wgOut->setPageTitle( wfMsg( 'spamprotectiontitle' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setArticleRelated( false );
+ $wgOut->addHtml( '
' );
$wgOut->addWikiText( wfMsg( 'spamprotectiontext' ) );
if ( $match )
- $wgOut->addWikiText( wfMsg( 'spamprotectionmatch', "{$match}" ) );
+ $wgOut->addWikiText( wfMsg( 'spamprotectionmatch',wfEscapeWikiText( $match ) ) );
+ $wgOut->addHtml( '
' );
- $wgOut->returnToMain( false, $this->uiTitle );
+ $wgOut->returnToMain( false, $wgTitle );
}
/**
@@ -1575,7 +1645,7 @@ END
// This is the revision the editor started from
$baseRevision = Revision::loadFromTimestamp(
- $db, $this->dbTitle, $this->edittime );
+ $db, $this->mTitle, $this->edittime );
if( is_null( $baseRevision ) ) {
wfProfileOut( $fname );
return false;
@@ -1584,7 +1654,7 @@ END
// The current state, we want to merge updates into it
$currentRevision = Revision::loadFromTitle(
- $db, $this->dbTitle );
+ $db, $this->mTitle );
if( is_null( $currentRevision ) ) {
wfProfileOut( $fname );
return false;
@@ -1896,7 +1966,8 @@ END
'title' => wfMsg( 'tooltip-diff' ).' ['.wfMsg( 'accesskey-diff' ).']',
);
$buttons['diff'] = wfElement('input', $temp, '');
-
+
+ wfRunHooks( 'EditPageBeforeEditButtons', array( &$this, &$buttons ) );
return $buttons;
}
@@ -1946,7 +2017,7 @@ END
$oldtitle = wfMsgExt( 'currentrev', array('parseinline') );
$newtitle = wfMsgExt( 'yourtext', array('parseinline') );
if ( $oldtext !== false || $newtext != '' ) {
- $de = new DifferenceEngine( $this->dbTitle );
+ $de = new DifferenceEngine( $this->mTitle );
$de->setText( $oldtext, $newtext );
$difftext = $de->getDiff( $oldtitle, $newtitle );
$de->showDiffStyle();
@@ -2086,7 +2157,7 @@ END
* @param OutputPage $out
*/
private function showDeletionLog( $out ) {
- $title = $this->dbTitle;
+ $title = $this->mTitle;
$reader = new LogReader(
new FauxRequest(
array(
@@ -2109,27 +2180,26 @@ END
* @return bool false if output is done, true if the rest of the form should be displayed
*/
function attemptSave() {
- global $wgUser, $wgOut;
+ global $wgUser, $wgOut, $wgTitle, $wgRequest;
$resultDetails = false;
- $value = $this->internalAttemptSave( $resultDetails );
+ $value = $this->internalAttemptSave( $resultDetails, $wgUser->isAllowed('bot') && $wgRequest->getBool('bot', true) );
- if( $value == AS_SUCCESS_UPDATE || $value = AS_SUCCESS_NEW_ARTICLE ) {
+ if( $value == self::AS_SUCCESS_UPDATE || $value == self::AS_SUCCESS_NEW_ARTICLE ) {
$this->didSave = true;
}
-
- switch ($value)
- {
+
+ switch ($value) {
case self::AS_HOOK_ERROR_EXPECTED:
case self::AS_CONTENT_TOO_BIG:
case self::AS_ARTICLE_WAS_DELETED:
case self::AS_CONFLICT_DETECTED:
case self::AS_SUMMARY_NEEDED:
case self::AS_TEXTBOX_EMPTY:
- case self::AS_MAX_ARTICLE_SIZE_EXCEDED:
+ case self::AS_MAX_ARTICLE_SIZE_EXCEEDED:
case self::AS_END:
return true;
-
+
case self::AS_HOOK_ERROR:
case self::AS_FILTERING:
case self::AS_SUCCESS_NEW_ARTICLE:
@@ -2144,6 +2214,10 @@ END
$this->blockedPage();
return false;
+ case self::AS_IMAGE_REDIRECT_ANON:
+ $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' );
+ return false;
+
case self::AS_READ_ONLY_PAGE_ANON:
$this->userNotLoggedInPage();
return false;
@@ -2162,8 +2236,12 @@ END
return;
case self::AS_BLANK_ARTICLE:
- $wgOut->redirect( $this->uiTitle->getFullURL() );
+ $wgOut->redirect( $wgTitle->getFullURL() );
return false;
+
+ case self::AS_IMAGE_REDIRECT_LOGGED:
+ $wgOut->permissionRequired( 'upload' );
+ return false;
}
}
}