* 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 ) ;
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 )
* 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);
$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 ) {
} else if ( $this->diff ) {
$this->editForm( 'diff' );
} else { # First time through
- if( $wgUser->getOption('previewonfirst') ) {
+ if( $wgUser->getOption('previewonfirst')
+ or $this->mTitle->getNamespace() == NS_CATEGORY ) {
$this->editForm( 'preview', true );
} else {
$this->extractMetaDataFromArticle () ;
$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 ) ) {
global $wgOut, $wgUser;
global $wgLang, $wgContLang, $wgParser, $wgTitle;
global $wgAllowAnonymousMinor;
- global $wgWhitelistEdit;
global $wgSpamRegex, $wgFilterCallback;
$sk = $wgUser->getSkin();
$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;
$userid = $wgUser->getID();
if ( $isConflict) {
- wfDebug( "EditPage::editForm conflict! getting section '$this->section' for time '$this->edittime'\n" );
+ 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);
}
# 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
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" );
}
}
}
} else {
$s = wfMsg('editingsection', $this->mTitle->getPrefixedText() );
}
- if(!$this->preview) {
+ if( !$this->preview && !$this->diff ) {
preg_match( "/^(=+)(.+)\\1/mi",
$this->textbox1,
$matches );
$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->addWikiText( wfMsg( 'editingold' ) );
}
$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' ) );
$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" );
}
}
$wgTitle, $parserOptions );
$previewHTML = $parserOutput->mText;
-
+
$wgOut->addCategoryLinks($parserOutput->getCategoryLinks());
$wgOut->addLanguageLinks($parserOutput->getLanguageLinks());
return $previewhead . $previewHTML;
* @access private
* @todo document
*/
- function mergeChangesInto( &$text ){
- $yourtext = $this->mArticle->fetchRevisionText();
-
+ function mergeChangesInto( &$editText ){
$db =& wfGetDB( DB_MASTER );
- $oldText = $this->mArticle->fetchRevisionText(
- $db->timestamp( $this->edittime ),
- 'rev_timestamp' );
- if(wfMerge($oldText, $text, $yourtext, $result)){
- $text = $result;
+ // This is the revision the editor started from
+ $baseRevision = Revision::loadFromTimestamp(
+ $db, $this->mArticle->mTitle, $this->edittime );
+ if( is_null( $baseRevision ) ) {
+ 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 ) ) {
+ return false;
+ }
+ $currentText = $currentRevision->getText();
+
+ if( wfMerge( $baseText, $editText, $currentText, $result ) ){
+ $editText = $result;
return true;
} else {
return false;
* @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 );
*/
function getDiff() {
require_once( 'DifferenceEngine.php' );
- $oldtext = $this->mArticle->getContent( true );
+ $oldtext = $this->mArticle->fetchContent();
$newtext = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
$this->section, $this->textbox1, $this->summary, $this->edittime );
$oldtitle = wfMsg( 'currentrev' );
dépôts / lhc / web / wiklou.git / blobdiff