$this->mPage->clear();
}
- /**
- * Note that getContent does not follow redirects anymore.
- * If you need to fetch redirectable content easily, try
- * the shortcut in WikiPage::getRedirectTarget()
- *
- * This function has side effects! Do not use this function if you
- * only want the real revision text if any.
- *
- * @deprecated since 1.21; use WikiPage::getContent() instead
- *
- * @return string Return the text of this revision
- */
- public function getContent() {
- wfDeprecated( __METHOD__, '1.21' );
- $content = $this->getContentObject();
- return ContentHandler::getContentText( $content );
- }
-
/**
* Returns a Content object representing the pages effective display content,
* not necessarily the revision's content!
return $oldid;
}
- /**
- * Get text of an article from database
- * Does *NOT* follow redirects.
- *
- * @protected
- * @note This is really internal functionality that should really NOT be
- * used by other functions. For accessing article content, use the WikiPage
- * class, especially WikiBase::getContent(). However, a lot of legacy code
- * uses this method to retrieve page text from the database, so the function
- * has to remain public for now.
- *
- * @return string|bool String containing article contents, or false if null
- * @deprecated since 1.21, use WikiPage::getContent() instead
- */
- function fetchContent() {
- // BC cruft!
-
- wfDeprecated( __METHOD__, '1.21' );
-
- if ( $this->mContentLoaded && $this->mContent ) {
- return $this->mContent;
- }
-
- $content = $this->fetchContentObject();
-
- if ( !$content ) {
- return false;
- }
-
- // @todo Get rid of mContent everywhere!
- $this->mContent = ContentHandler::getContentText( $content );
- ContentHandler::runLegacyHooks(
- 'ArticleAfterFetchContent',
- [ &$this, &$this->mContent ],
- '1.21'
- );
-
- return $this->mContent;
- }
-
/**
* Get text content object
* Does *NOT* follow redirects.
$this->mContentObject = $content;
$this->mRevIdFetched = $this->mRevision->getId();
- ContentHandler::runLegacyHooks(
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $articlePage = $this;
+
+ Hooks::run(
'ArticleAfterFetchContentObject',
- [ &$this, &$this->mContentObject ],
- '1.21'
+ [ &$articlePage, &$this->mContentObject ]
);
return $this->mContentObject;
while ( !$outputDone && ++$pass ) {
switch ( $pass ) {
case 1:
- Hooks::run( 'ArticleViewHeader', [ &$this, &$outputDone, &$useParserCache ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $articlePage = $this;
+ Hooks::run( 'ArticleViewHeader', [ &$articlePage, &$outputDone, &$useParserCache ] );
break;
case 2:
# Early abort if the page doesn't exist
$ns = $this->getTitle()->getNamespace();
- # Don't index user and user talk pages for blocked users (bug 11443)
+ # Don't index user and user talk pages for blocked users (T13443)
if ( ( $ns == NS_USER || $ns == NS_USER_TALK ) && !$this->getTitle()->isSubpage() ) {
$specificTarget = null;
$vagueTarget = null;
}
if ( isset( $wgArticleRobotPolicies[$this->getTitle()->getPrefixedText()] ) ) {
- # (bug 14900) site config can override user-defined __INDEX__ or __NOINDEX__
+ # (T16900) site config can override user-defined __INDEX__ or __NOINDEX__
$policy = array_merge(
$policy,
self::formatRobotPolicy( $wgArticleRobotPolicies[$this->getTitle()->getPrefixedText()] )
$redirectTargetUrl = $this->getTitle()->getLinkURL( $query );
if ( isset( $this->mRedirectedFrom ) ) {
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $articlePage = $this;
+
// This is an internally redirected page view.
// We'll need a backlink to the source page for navigation.
- if ( Hooks::run( 'ArticleViewRedirect', [ &$this ] ) ) {
+ if ( Hooks::run( 'ArticleViewRedirect', [ &$articlePage ] ) ) {
$redir = Linker::linkKnown(
$this->mRedirectedFrom,
null,
$loggedIn = $this->getContext()->getUser()->isLoggedIn();
if ( $loggedIn || $cache->get( $key ) ) {
$logTypes = [ 'delete', 'move' ];
- $conds = [ "log_action != 'revision'" ];
+
+ $dbr = wfGetDB( DB_REPLICA );
+
+ $conds = [ 'log_action != ' . $dbr->addQuotes( 'revision' ) ];
// Give extensions a chance to hide their (unrelated) log entries
Hooks::run( 'Article::MissingArticleConditions', [ &$conds, $logTypes ] );
LogEventsList::showLogExtract(
* @param int $oldid Revision ID of this article revision
*/
public function setOldSubtitle( $oldid = 0 ) {
- if ( !Hooks::run( 'DisplayOldSubtitle', [ &$this, &$oldid ] ) ) {
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $articlePage = $this;
+
+ if ( !Hooks::run( 'DisplayOldSubtitle', [ &$articlePage, &$oldid ] ) ) {
return;
}
Hooks::run( 'ArticleConfirmDelete', [ $this, $outputPage, &$reason ] );
$user = $this->getContext()->getUser();
-
if ( $user->isAllowed( 'suppressrevision' ) ) {
$suppress = Html::openElement( 'div', [ 'id' => 'wpDeleteSuppressRow' ] ) .
Xml::checkLabel( wfMessage( 'revdelete-suppress' )->text(),
$suppress = '';
}
$checkWatch = $user->getBoolOption( 'watchdeletion' ) || $user->isWatched( $title );
-
$form = Html::openElement( 'form', [ 'method' => 'post',
'action' => $title->getLocalURL( 'action=delete' ), 'id' => 'deleteconfirm' ] ) .
Html::openElement( 'fieldset', [ 'id' => 'mw-delete-table' ] ) .
&& !$this->mRedirectedFrom && !$this->getTitle()->isRedirect();
// Extension may have reason to disable file caching on some pages.
if ( $cacheable ) {
- $cacheable = Hooks::run( 'IsFileCacheable', [ &$this ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $articlePage = $this;
+ $cacheable = Hooks::run( 'IsFileCacheable', [ &$articlePage ] );
}
}
/**
* Call to WikiPage function for backwards compatibility.
- * @see WikiPage::doEdit
- *
- * @deprecated since 1.21: use doEditContent() instead.
- */
- public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
- wfDeprecated( __METHOD__, '1.21' );
- return $this->mPage->doEdit( $text, $summary, $flags, $baseRevId, $user );
- }
-
- /**
- * Call to WikiPage function for backwards compatibility.
+ * @deprecated since 1.29. Use WikiPage::doEditContent() directly instead
* @see WikiPage::doEditContent
*/
public function doEditContent( Content $content, $summary, $flags = 0, $baseRevId = false,
User $user = null, $serialFormat = null
) {
+ wfDeprecated( __METHOD__, '1.29' );
return $this->mPage->doEditContent( $content, $summary, $flags, $baseRevId,
$user, $serialFormat
);
dépôts / lhc / web / wiklou.git / blobdiff