class EditPage {
var $mArticle;
var $mTitle;
+ var $mMetaData = '';
# Form values
- var $save = false, $preview = false;
+ var $save = false, $preview = false, $diff = false;
var $minoredit = false, $watchthis = false;
var $textbox1 = '', $textbox2 = '', $summary = '';
var $edittime = '', $section = '';
$this->mTitle =& $wgTitle;
}
+ /**
+ * This is the function that extracts metadata from the article body on the first view.
+ * To turn the feature on, set $wgUseMetadataEdit = true ; in LocalSettings
+ * 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 = '' ;
+ $t = $this->mArticle->getContent ( true ) ;
+
+ # MISSING : <nowiki> 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 ) ) ;
+ }
+ }
+ }
+ 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(true) ) ;
+ 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 ) ;
+ }
+
+ }
+
+ # Templates, but only some
+ $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 ) ;
+ }
+ else $t[$key] = '{{' . $x ;
+ }
+ else if ( $key != 0 ) $t[$key] = '{{' . $x ;
+ else $t[$key] = $x ;
+ }
+ if ( count ( $tl ) ) $s .= implode ( ' ' , $tl ) ;
+ $t = implode ( '' , $t ) ;
+
+ $t = str_replace ( "\n\n\n" , "\n" , $t ) ;
+ $this->mArticle->mContent = $t ;
+ $this->mMetaData = $s ;
+ }
+
/**
* This is the function that gets called for "action=edit".
*/
$wgOut->readOnlyPage( $this->mArticle->getContent( true ), true );
return;
}
- if ( $wgUser->isBlocked() ) {
+ if ( !$this->preview && !$this->diff && $wgUser->isBlocked( !$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->getID() && $wgWhitelistEdit ) {
+ if ( $wgUser->isAnon() && $wgWhitelistEdit ) {
$this->userNotLoggedInPage();
return;
}
if ( wfReadOnly() ) {
if( $this->save || $this->preview ) {
$this->editForm( 'preview' );
+ } else if ( $this->diff ) {
+ $this->editForm( 'diff' );
} else {
$wgOut->readOnlyPage( $this->mArticle->getContent( true ) );
}
}
if ( $this->save ) {
$this->editForm( 'save' );
- } else if ( $this->preview or $wgUser->getOption('previewonfirst')) {
+ } else if ( $this->preview ) {
$this->editForm( 'preview' );
+ } else if ( $this->diff ) {
+ $this->editForm( 'diff' );
} else { # First time through
- $this->editForm( 'initial' );
+ if( $wgUser->getOption('previewonfirst') ) {
+ $this->editForm( 'preview', true );
+ } else {
+ $this->extractMetaDataFromArticle () ;
+ $this->editForm( 'initial', true );
+ }
}
}
* @todo document
*/
function importFormData( &$request ) {
- # 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.
- $this->textbox1 = rtrim( $request->getText( 'wpTextbox1' ) );
- $this->textbox2 = rtrim( $request->getText( 'wpTextbox2' ) );
- $this->summary = trim( $request->getText( 'wpSummary' ) );
-
- $this->edittime = $request->getVal( 'wpEdittime' );
- if( !preg_match( '/^\d{14}$/', $this->edittime )) $this->edittime = '';
-
- $this->preview = $request->getCheck( 'wpPreview' );
- $this->save = $request->wasPosted() && !$this->preview;
- $this->minoredit = $request->getCheck( 'wpMinoredit' );
- $this->watchthis = $request->getCheck( 'wpWatchthis' );
+ 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.
+ $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->edittime = $request->getVal( 'wpEdittime' );
+ if( is_null( $this->edittime ) ) {
+ # If the form is incomplete, force to preview.
+ $this->preview = true;
+ } else {
+ 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.
+ $this->preview = $request->getCheck( 'wpPreview' );
+ $this->diff = $request->getCheck( 'wpDiff' );
+ } else {
+ # Page might be a hack attempt posted from
+ # an external site. Preview instead of saving.
+ $this->preview = true;
+ }
+ }
+ $this->save = ! ( $this->preview OR $this->diff );
+ if( !preg_match( '/^\d{14}$/', $this->edittime )) {
+ $this->edittime = null;
+ }
+
+ $this->minoredit = $request->getCheck( 'wpMinoredit' );
+ $this->watchthis = $request->getCheck( 'wpWatchthis' );
+ } else {
+ # Not a posted form? Start with nothing.
+ $this->textbox1 = '';
+ $this->textbox2 = '';
+ $this->mMetaData = '';
+ $this->summary = '';
+ $this->edittime = '';
+ $this->preview = false;
+ $this->save = false;
+ $this->diff = false;
+ $this->minoredit = false;
+ $this->watchthis = false;
+ }
$this->oldid = $request->getInt( 'oldid' );
}
/**
- * Since there is only one text field on the edit form,
- * pressing <enter> will cause the form to be submitted, but
- * the submit button value won't appear in the query, so we
- * Fake it here before going back to edit(). This is kind of
- * ugly, but it helps some old URLs to still work.
+ * Make sure the form isn't faking a user's credentials.
+ *
+ * @param WebRequest $request
+ * @return bool
+ * @access private
*/
+ function tokenOk( &$request ) {
+ global $wgUser;
+ if( $wgUser->isAnon() ) {
+ # Anonymous users may not have a session
+ # open. Don't tokenize.
+ return true;
+ } else {
+ return $wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
+ }
+ }
+
function submit() {
- if( !$this->preview ) $this->save = true;
-
$this->edit();
}
* is made and all is well do we actually save and redirect to
* the newly-edited page.
*
- * @param string $formtype Type of form either : save, initial or preview
+ * @param string $formtype Type of form either : save, initial, diff or preview
+ * @param bool $firsttime True to load form data from db
*/
- function editForm( $formtype ) {
+ function editForm( $formtype, $firsttime = false ) {
global $wgOut, $wgUser;
global $wgLang, $wgContLang, $wgParser, $wgTitle;
global $wgAllowAnonymousMinor;
global $wgWhitelistEdit;
global $wgSpamRegex, $wgFilterCallback;
- global $wgUseLatin1;
$sk = $wgUser->getSkin();
$isConflict = false;
// css / js subpages of user pages get a special treatment
- $isCssJsSubpage = (Namespace::getUser() == $wgTitle->getNamespace() and preg_match("/\\.(css|js)$/", $wgTitle->getText() ));
+ $isCssJsSubpage = $wgTitle->isCssJsSubpage();
+
if(!$this->mTitle->getArticleID()) { # new article
$wgOut->addWikiText(wfmsg('newarticletext'));
}
- if( Namespace::isTalk( $this->mTitle->getNamespace() ) ) {
+ if( $this->mTitle->isTalkPage() ) {
$wgOut->addWikiText(wfmsg('talkpagetext'));
}
# in the back door with a hand-edited submission URL.
if ( 'save' == $formtype ) {
+ # Reintegrate metadata
+ if ( $this->mMetaData != '' ) $this->textbox1 .= "\n" . $this->mMetaData ;
+ $this->mMetaData = '' ;
+
# Check for spam
if ( $wgSpamRegex && preg_match( $wgSpamRegex, $this->textbox1, $matches ) ) {
$this->spamPage ( $matches[0] );
# Error messages or other handling should be performed by the filter function
return;
}
- if ( $wgUser->isBlocked() ) {
+ if ( $wgUser->isBlocked( false ) ) {
+ # Check block state against master, thus 'false'.
$this->blockedIPpage();
return;
}
- if ( !$wgUser->getID() && $wgWhitelistEdit ) {
+ if ( $wgUser->isAnon() && $wgWhitelistEdit ) {
$this->userNotLoggedInPage();
return;
}
$wgOut->redirect( $this->mTitle->getFullURL() );
return;
}
- if (wfRunHooks('ArticleSave', $this->mArticle, $wgUser, $this->textbox1,
- $this->summary, $this->minoredit, $this->watchthis, NULL))
+ if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$this->textbox1,
+ &$this->summary, &$this->minoredit, &$this->watchthis, NULL)))
{
$this->mArticle->insertNewArticle( $this->textbox1, $this->summary,
$this->minoredit, $this->watchthis );
- wfRunHooks('ArticleSaveComplete', $this->mArticle, $wgUser, $this->textbox1,
- $this->summary, $this->minoredit, $this->watchthis, NULL);
+ wfRunHooks('ArticleSaveComplete', array(&$this->mArticle, &$wgUser, $this->textbox1,
+ $this->summary, $this->minoredit,
+ $this->watchthis, NULL));
}
return;
}
}
}
- if (wfRunHooks('ArticleSave', $this, $wgUser, $text, $this->summary,
- $this->minoredit, $this->watchthis, $sectionanchor))
+ if (wfRunHooks('ArticleSave', array(&$this->mArticle, &$wgUser, &$text,
+ &$this->summary, &$this->minoredit,
+ &$this->watchthis, &$sectionanchor)))
{
# update the article here
if($this->mArticle->updateArticle( $text, $this->summary, $this->minoredit,
$this->watchthis, '', $sectionanchor ))
{
- wfRunHooks('ArticleSaveComplete', $this, $wgUser, $text, $this->summary,
- $this->minoredit, $this->watchthis, $sectionanchor);
+ wfRunHooks('ArticleSaveComplete', array(&$this->mArticle, &$wgUser, $text,
+ $this->summary, $this->minoredit,
+ $this->watchthis, $sectionanchor));
return;
}
else
# First time through: get contents, set time for conflict
# checking, etc.
- if ( 'initial' == $formtype ) {
+ if ( 'initial' == $formtype || $firsttime ) {
$this->edittime = $this->mArticle->getTimestamp();
$this->textbox1 = $this->mArticle->getContent( true );
$this->summary = '';
$s = wfMsg( 'editing', $this->mTitle->getPrefixedText() );
}
$wgOut->setPageTitle( $s );
- if ( !$wgUseLatin1 && !$this->checkUnicodeCompliantBrowser() ) {
+ if ( !$this->checkUnicodeCompliantBrowser() ) {
$this->mArticle->setOldSubtitle();
$wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
}
$watchthis = wfMsg ('watchthis');
$save = wfMsg('savearticle');
$prev = wfMsg('showpreview');
+ $diff = wfMsg('showdiff');
$cancel = $sk->makeKnownLink( $this->mTitle->getPrefixedText(),
wfMsg('cancel') );
global $wgRightsText;
$copywarn = "<div id=\"editpage-copywarn\">\n" .
wfMsg( $wgRightsText ? 'copyrightwarning' : 'copyrightwarning2',
- '[[' . wfMsg( 'copyrightpage' ) . ']]',
+ '[[' . wfMsgForContent( 'copyrightpage' ) . ']]',
$wgRightsText ) . "\n</div>";
if( $wgUser->getOption('showtoolbar') and !$isCssJsSubpage ) {
}
// activate checkboxes if user wants them to be always active
- if( !$this->preview ) {
+ if( !$this->preview && !$this->diff ) {
if( $wgUser->getOption( 'watchdefault' ) ) $this->watchthis = true;
if( $wgUser->getOption( 'minordefault' ) ) $this->minoredit = true;
$minoredithtml = '';
- if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
+ if ( $wgUser->isLoggedIn() || $wgAllowAnonymousMinor ) {
$minoredithtml =
"<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
" accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
$watchhtml = '';
- if ( 0 != $wgUser->getID() ) {
+ if ( $wgUser->isLoggedIn() ) {
$watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".($this->watchthis?" checked='checked'":"").
" accesskey='".wfMsg('accesskey-watch')."' id='wpWatchthis' />".
"<label for='wpWatchthis' title='".wfMsg('tooltip-watch')."'>{$watchthis}</label>";
$wgOut->addHTML( '<div id="wikiPreview">' );
if ( 'preview' == $formtype) {
$previewOutput = $this->getPreviewText( $isConflict, $isCssJsSubpage );
- if( $wgUser->getOption('previewontop' ) ) {
+ if ( $wgUser->getOption('previewontop' ) ) {
$wgOut->addHTML( $previewOutput );
$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( '</div>' );
+ }
+
# 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
$editsummary="{$summary}: <input tabindex='3' type='text' value=\"$summarytext\" name=\"wpSummary\" maxlength='200' size='60' /><br />";
}
- if( !$this->preview ) {
+ if( !$this->preview && !$this->diff ) {
# Don't select the edit box on preview; this interferes with seeing what's going on.
$wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' );
}
# Prepare a list of templates used by this page
- $db =& wfGetDB( DB_SLAVE );
- $page = $db->tableName( 'page' );
- $links = $db->tableName( 'links' );
- $id = $this->mTitle->getArticleID();
- $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 ( $db->numRows( $res ) ) {
+ $templates = '';
+ $articleTemplates = $this->mArticle->getUsedTemplates();
+ if ( count( $articleTemplates ) > 0 ) {
$templates = '<br />'. wfMsg( 'templatesused' ) . '<ul>';
- while ( $row = $db->fetchObject( $res ) ) {
- if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
+ foreach ( $articleTemplates as $tpl ) {
+ if ( $titleObj = Title::makeTitle( NS_TEMPLATE, $tpl ) ) {
$templates .= '<li>' . $sk->makeLinkObj( $titleObj ) . '</li>';
}
}
$templates .= '</ul>';
- } else {
- $templates = '';
}
global $wgLivePreview, $wgStylePath;
$liveOnclick = '';
}
+ global $wgUseMetadataEdit ;
+ if ( $wgUseMetadataEdit )
+ {
+ $metadata = $this->mMetaData ;
+ $metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ;
+ $helppage = Title::newFromText ( wfmsg("metadata_page") ) ;
+ $top = str_replace ( "$1" , $helppage->getInternalURL() , wfmsg("metadata") ) ;
+ $metadata = $top . "<textarea name='metadata' rows='3' cols='{$cols}'{$ew}>{$metadata}</textarea>" ;
+ }
+ else $metadata = "" ;
+
+
$wgOut->addHTML( <<<END
{$toolbar}
<form id="editform" name="editform" method="post" action="$action"
. htmlspecialchars( $wgContLang->recodeForEdit( $this->textbox1 ) ) .
"
</textarea>
+{$metadata}
<br />{$editsummary}
{$checkboxhtml}
<input tabindex='5' id='wpSave' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"".wfMsg('accesskey-save')."\"".
-" title=\"".wfMsg('tooltip-save')."\"/>
+" title=\"".wfMsg('tooltip-save')."\"/> 
<input tabindex='6' id='wpPreview' type='submit' $liveOnclick value=\"{$prev}\" name=\"wpPreview\" accesskey=\"".wfMsg('accesskey-preview')."\"".
" title=\"".wfMsg('tooltip-preview')."\"/>
+<input tabindex='6' 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 );
$wgOut->addHTML( "
<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
+ if ( $wgUser->isLoggedIn() ) {
+ /**
+ * To make it harder for someone to slip a user a page
+ * which submits an edit form to the wiki without their
+ * knowledge, a random token is associated with the login
+ * session. If it's not passed back with the submission,
+ * we won't save the page, or render user JavaScript and
+ * CSS previews.
+ */
+ $token = htmlspecialchars( $wgUser->editToken() );
+ $wgOut->addHTML( "
+<input type='hidden' value=\"$token\" name=\"wpEditToken\" />\n" );
+ }
+
+
if ( $isConflict ) {
require_once( "DifferenceEngine.php" );
$wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );
</textarea>" );
}
$wgOut->addHTML( "</form>\n" );
- if($formtype =="preview" && !$wgUser->getOption("previewontop")) {
- $wgOut->addHTML('<div id="wikiPreview">' . $previewOutput . '</div>');
+ if ( $formtype == 'preview' && !$wgUser->getOption( 'previewontop' ) ) {
+ $wgOut->addHTML( '<div id="wikiPreview">' . $previewOutput . '</div>' );
+ }
+ if ( $formtype == 'diff' && !$wgUser->getOption( 'previewontop' ) ) {
+ $wgOut->addHTML( '<div id="wikiPreview">' . $difftext . '</div>' );
}
}
+ function getDiffText() {
+ }
+
+ /**
+ * @todo document
+ */
function getPreviewText( $isConflict, $isCssJsSubpage ) {
- global $wgOut, $wgUser, $wgTitle, $wgParser;
- $previewhead='<h2>' . wfMsg( 'preview' ) . "</h2>\n<p><center><font color=\"#cc0000\">" .
- wfMsg( 'note' ) . wfMsg( 'previewnote' ) . "</font></center></p>\n";
+ global $wgOut, $wgUser, $wgTitle, $wgParser, $wgAllowDiffPreview, $wgEnableDiffPreviewPreference;
+ $previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
+ "<p class='previewnote'>" . htmlspecialchars( wfMsg( 'previewnote' ) ) . "</p>\n";
if ( $isConflict ) {
- $previewhead.='<h2>' . wfMsg( 'previewconflict' ) .
+ $previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) .
"</h2>\n";
}
$parserOptions = ParserOptions::newFromUser( $wgUser );
$parserOptions->setEditSection( false );
- $parserOptions->setEditSectionOnRightClick( false );
# don't parse user css/js, show message about preview
# XXX: stupid php bug won't let us use $wgTitle->isCssJsSubpage() here
}
$parserOutput = $wgParser->parse( $previewtext , $wgTitle, $parserOptions );
$wgOut->addHTML( $parserOutput->mText );
+ return $previewhead;
} else {
# if user want to see preview when he edit an article
if( $wgUser->getOption('previewonfirst') and ($this->textbox1 == '')) {
$this->textbox1 = $this->mArticle->getContent(true);
}
- $parserOutput = $wgParser->parse( $this->mArticle->preSaveTransform( $this->textbox1 ) ."\n\n",
+ $toparse = $this->textbox1 ;
+ 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;
}
- return $previewhead . $previewHTML;
}
/**
} else {
$name = $id;
}
- $link = '[[' . $wgContLang->getNsText( Namespace::getUser() ) .
+ $link = '[[' . $wgContLang->getNsText( NS_USER ) .
":{$name}|{$name}]]";
$wgOut->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) );
* @todo document
*/
function userNotLoggedInPage() {
- global $wgOut, $wgUser;
+ global $wgOut;
$wgOut->setPageTitle( wfMsg( 'whitelistedittitle' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
dépôts / lhc / web / wiklou.git / blobdiff