*/
public static function newFromID( $id ) {
$t = Title::newFromID( $id );
- return $t == null ? null : new Article( $t );
+ # FIXME: doesn't inherit right
+ return $t == null ? null : new self( $t );
+ #return $t == null ? null : new static( $t ); // PHP 5.3
}
/**
* the shortcut in Article::followContent()
*
* @return Return the text of this revision
- */
+ */
public function getContent() {
global $wgUser, $wgContLang, $wgOut, $wgMessageCache;
wfProfileIn( __METHOD__ );
* Get the text of the current revision. No side-effects...
*
* @return Return the text of the current revision
- */
+ */
public function getRawText() {
// Check process cache for current revision
if( $this->mContentLoaded && $this->mOldId == 0 ) {
*
* @param $x Mixed: FIXME
*/
- public function forUpdate( $x = NULL ) {
+ public function forUpdate( $x = null ) {
return wfSetVar( $this->mForUpdate, $x );
}
} else {
$titleObj = Title::newFromRedirect( $text );
}
- return $titleObj !== NULL;
+ return $titleObj !== null;
}
/**
}
/**
- * This is the default action of the index.php entry point: just view the
+ * This is the default action of the index.php entry point: just view the
* page of the given title.
- */
+ */
public function view() {
global $wgUser, $wgOut, $wgRequest, $wgContLang;
global $wgEnableParserCache, $wgStylePath, $wgParser;
*/
public function showDiffPage() {
global $wgOut, $wgRequest, $wgUser;
-
+
$diff = $wgRequest->getVal( 'diff' );
$rcid = $wgRequest->getVal( 'rcid' );
$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
}
/**
- * Show a page view for a page formatted as CSS or JavaScript. To be called by
+ * Show a page view for a page formatted as CSS or JavaScript. To be called by
* Article::view() only.
*
- * This is hooked by SyntaxHighlight_GeSHi to do syntax highlighting of these
+ * This is hooked by SyntaxHighlight_GeSHi to do syntax highlighting of these
* page views.
*/
public function showCssOrJsPage() {
$policy = $this->getRobotPolicy( 'view' );
return $policy['index'] . ',' . $policy['follow'];
}
-
+
/**
* Get the robot policy to be used for the current view
* @param $action String the action= GET parameter
* TODO: actions other than 'view'
*/
public function getRobotPolicy( $action ){
-
+
global $wgOut, $wgArticleRobotPolicies, $wgNamespaceRobotPolicies;
global $wgDefaultRobotPolicy, $wgRequest;
}
/**
- * If this request is a redirect view, send "redirected from" subtitle to
- * $wgOut. Returns true if the header was needed, false if this is not a
+ * If this request is a redirect view, send "redirected from" subtitle to
+ * $wgOut. Returns true if the header was needed, false if this is not a
* redirect view. Handles both local and remote redirects.
*/
public function showRedirectedFromHeader() {
}
/**
- * Show a header specific to the namespace currently being viewed, like
+ * Show a header specific to the namespace currently being viewed, like
* [[MediaWiki:Talkpagetext]]. For Article::view().
*/
public function showNamespaceHeader() {
}
/**
- * If patrol is possible, output a patrol UI box. This is called from the
- * footer section of ordinary page views. If patrol is not possible or not
+ * If patrol is possible, output a patrol UI box. This is called from the
+ * footer section of ordinary page views. If patrol is not possible or not
* desired, does nothing.
*/
public function showPatrolFooter() {
) .
'</div>'
);
- }
+ }
/**
- * Show the error text for a missing article. For articles in the MediaWiki
+ * Show the error text for a missing article. For articles in the MediaWiki
* namespace, show the default message text. To be called from Article::view().
*/
public function showMissingArticle() {
array( 'lim' => 10,
'conds' => array( "log_action != 'revision'" ),
'showIfEmpty' => false,
- 'msgKey' => array( 'moveddeleted-notice' ) )
+ 'msgKey' => array( 'moveddeleted-notice' ) )
);
# Show error message
$oldid = $this->getOldID();
if( $oldid ) {
- $text = wfMsgNoTrans( 'missing-article',
+ $text = wfMsgNoTrans( 'missing-article',
$this->mTitle->getPrefixedText(),
wfMsgNoTrans( 'missingarticle-rev', $oldid ) );
} elseif ( $this->mTitle->getNamespace() === NS_MEDIAWIKI ) {
$createErrors = $this->mTitle->getUserPermissionsErrors( 'create', $wgUser );
$editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser );
$errors = array_merge( $createErrors, $editErrors );
-
+
if ( !count($errors) )
$text = wfMsgNoTrans( 'noarticletext' );
else
}
/**
- * If the revision requested for view is deleted, check permissions.
+ * If the revision requested for view is deleted, check permissions.
* Send either an error message or a warning header to $wgOut.
* Returns true if the view is allowed, false if not.
*/
}
/**
- * Try to fetch an expired entry from the parser cache. If it is present,
- * output it and return true. If it is not present, output nothing and
- * return false. This is used as a callback function for
+ * Try to fetch an expired entry from the parser cache. If it is present,
+ * output it and return true. If it is not present, output nothing and
+ * return false. This is used as a callback function for
* PoolCounter::executeProtected().
*/
public function tryDirtyCache() {
$wgOut->enableClientCache( false );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->addWikiText(
- '<div class="errorbox">' .
+ '<div class="errorbox">' .
$status->getWikiText( false, 'view-pool-error' ) .
'</div>'
);
if( $wgUseSquid ) {
// Commit the transaction before the purge is sent
$dbw = wfGetDB( DB_MASTER );
- $dbw->immediateCommit();
+ $dbw->commit();
// Send purge
$update = SquidUpdate::newSimplePurge( $this->mTitle );
* Giving 0 indicates the new page flag should be set
* on.
* @param $lastRevIsRedirect Boolean: if given, will optimize adding and
- * removing rows in redirect table.
+ * removing rows in redirect table.
* @return bool true on success, false on failure
* @private
*/
'page_latest' => $revision->getId(),
'page_touched' => $dbw->timestamp(),
'page_is_new' => ($lastRevision === 0) ? 1 : 0,
- 'page_is_redirect' => $rt !== NULL ? 1 : 0,
+ 'page_is_redirect' => $rt !== null ? 1 : 0,
'page_len' => strlen( $text ),
),
$conditions,
*
* @param $dbw Database
* @param $redirectTitle a title object pointing to the redirect target,
- * or NULL if this is not a redirect
+ * or NULL if this is not a redirect
* @param $lastRevIsRedirect If given, will optimize adding and
- * removing rows in redirect table.
+ * removing rows in redirect table.
* @return bool true on success, false on failure
* @private
*/
* @param $section empty/null/false or a section number (0, 1, 2, T1, T2...)
* @return string Complete article text, or null if error
*/
- public function replaceSection( $section, $text, $summary = '', $edittime = NULL ) {
+ public function replaceSection( $section, $text, $summary = '', $edittime = null ) {
wfProfileIn( __METHOD__ );
if( strval( $section ) == '' ) {
// Whole-page edit; let the whole text through
/**
* User-interface handler for the "watch" action
*/
-
public function watch() {
global $wgUser, $wgOut;
if( $wgUser->isAnon() ) {
* @return bool true on success
*/
public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) {
- global $wgUser, $wgRestrictionTypes, $wgContLang;
+ global $wgUser, $wgContLang;
+
+ $restrictionTypes = $this->mTitle->getRestrictionTypes();
$id = $this->mTitle->getArticleID();
if ( $id <= 0 ) {
$current = array();
$updated = Article::flattenRestrictions( $limit );
$changed = false;
- foreach( $wgRestrictionTypes as $action ) {
+ foreach( $restrictionTypes as $action ) {
if( isset( $expiry[$action] ) ) {
# Get current restrictions on $action
$aLimits = $this->mTitle->getRestrictions( $action );
if( $confirm ) {
$this->doDelete( $reason, $suppress );
- if( $wgRequest->getCheck( 'wpWatch' ) ) {
+ if( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
$this->doWatch();
} elseif( $this->mTitle->userIsWatching() ) {
$this->doUnwatch();
$skin = $wgUser->getSkin();
$revisions = $this->estimateRevisionCount();
$wgOut->addHTML( '<strong class="mw-delete-warning-revisions">' .
- wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .' ' .
- $skin->historyLink() .
+ wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .
+ wfMsgHtml( 'word-separator' ) . $skin->historyLink() .
'</strong>'
);
if( $bigHistory ) {
//return $dbr->selectField( 'revision', 'COUNT(*)',
// array( 'rev_page' => $this->getId() ), __METHOD__ );
return $dbr->estimateRowCount( 'revision', '*',
- array( 'rev_page' => $this->getId() ), __METHOD__ );
+ array( 'rev_page' => $this->getId() ), __METHOD__ );
}
/**
$wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->addWikiMsg( 'confirmdeletetext' );
-
+
wfRunHooks( 'ArticleConfirmDelete', array( $this, $wgOut, &$reason ) );
if( $wgUser->isAllowed( 'suppressrevision' ) ) {
'autofocus'
) ) .
"</td>
- </tr>
+ </tr>";
+ # Dissalow watching is user is not logged in
+ if( $wgUser->isLoggedIn() ) {
+ $form .= "
<tr>
<td></td>
<td class='mw-input'>" .
Xml::checkLabel( wfMsg( 'watchthis' ),
'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
"</td>
- </tr>
+ </tr>";
+ }
+ $form .= "
$suppress
<tr>
<td></td>
$user_text = $dbw->addQuotes( $current->getRawUserText() );
$s = $dbw->selectRow( 'revision',
array( 'rev_id', 'rev_timestamp', 'rev_deleted' ),
- array( 'rev_page' => $current->getPage(),
+ array( 'rev_page' => $current->getPage(),
"rev_user != {$user} OR rev_user_text != {$user_text}"
), __METHOD__,
- array( 'USE INDEX' => 'page_timestamp',
+ array( 'USE INDEX' => 'page_timestamp',
'ORDER BY' => 'rev_timestamp DESC' )
);
if( $s === false ) {
$newId = $details['newid'];
$wgOut->setPageTitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
- $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
- . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+ if ( $current->getUserText() === '' ) {
+ $old = wfMsg( 'rev-deleted-user' );
+ } else {
+ $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() )
+ . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
+ }
$new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
. $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
$wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
$r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" .
wfMsgExt(
$infomsg,
- array( 'parseinline', 'replaceafter' ),
+ array( 'parseinline', 'replaceafter' ),
$td,
$userlinks,
$revision->getID(),
*
* @param $title a title object
*/
-
public static function onArticleCreate( $title ) {
# Update existence markers on article/talk tabs...
if( $title->isTalkPage() ) {
$this->mParserOutput = $this->getOutputFromWikitext( $text, $cache, $parserOptions );
$wgOut->addParserOutput( $this->mParserOutput );
}
-
+
/**
* This does all the heavy lifting for outputWikitext, except it returns the parser
* output instead of sending it straight to $wgOut. Makes things nice and simple for,
}
$insertRows = array();
foreach( $insertCats as $cat ) {
- $insertRows[] = array( 'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ),
- 'cat_title' => $cat );
+ $insertRows[] = array(
+ 'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ),
+ 'cat_title' => $cat
+ );
}
$dbw->insert( 'category', $insertRows, __METHOD__, 'IGNORE' );
);
}
}
-
+
/** Lightweight method to get the parser output for a page, checking the parser cache
- * and so on. Doesn't consider most of the stuff that Article::view is forced to
- * consider, so it's not appropriate to use there. */
+ * and so on. Doesn't consider most of the stuff that Article::view is forced to
+ * consider, so it's not appropriate to use there.
+ */
function getParserOutput( $oldid = null ) {
global $wgEnableParserCache, $wgUser, $wgOut;
$useParserCache = $wgEnableParserCache &&
intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 &&
$this->exists() &&
- $oldid === null;
-
+ $oldid === null;
+
wfDebug( __METHOD__.': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
if ( $wgUser->getOption( 'stubthreshold' ) ) {
wfIncrStats( 'pcache_miss_stub' );
if ( $parserOutput === false ) {
// Cache miss; parse and output it.
$rev = Revision::newFromTitle( $this->getTitle(), $oldid );
-
+
return $this->getOutputFromWikitext( $rev->getText(), $useParserCache );
} else {
return $parserOutput;
dépôts / lhc / web / wiklou.git / blobdiff