From 36e6ab15da9f2a587f3d3e7c3b2f9aadb3285d21 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Fri, 19 Jan 2018 16:44:30 -0800 Subject: [PATCH] Fix called function case in a bunch of places Change-Id: If1e392290a5bab3bce389f7da692e53a748b8aff --- includes/EditPage.php | 2 +- includes/Feed.php | 8 ++++---- includes/Storage/RevisionStore.php | 2 +- includes/Title.php | 4 ++-- includes/api/ApiComparePages.php | 2 +- includes/api/ApiOptions.php | 2 +- includes/libs/mime/XmlTypeCheck.php | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 72c3c14194..5dc0720750 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3727,7 +3727,7 @@ class EditPage { return new OOUI\ButtonWidget( [ 'id' => 'mw-editform-cancel', - 'href' => $this->getContextTitle()->getLinkUrl( $cancelParams ), + 'href' => $this->getContextTitle()->getLinkURL( $cancelParams ), 'label' => new OOUI\HtmlSnippet( $this->context->msg( 'cancel' )->parse() ), 'framed' => false, 'infusable' => true, diff --git a/includes/Feed.php b/includes/Feed.php index 92eec0830a..86e9bee69d 100644 --- a/includes/Feed.php +++ b/includes/Feed.php @@ -88,7 +88,7 @@ class FeedItem { * @return string */ public function getUniqueID() { - $id = $this->getUniqueIDUnescaped(); + $id = $this->getUniqueIdUnescaped(); if ( $id ) { return $this->xmlEncode( $id ); } @@ -383,7 +383,7 @@ class RSSFeed extends ChannelFeed { "title" => $item->getTitle(), "url" => $this->xmlEncode( wfExpandUrl( $item->getUrlUnescaped(), PROTO_CURRENT ) ), "permalink" => $item->rssIsPermalink, - "uniqueID" => $item->getUniqueId(), + "uniqueID" => $item->getUniqueID(), "description" => $item->getDescription(), "date" => $this->xmlEncode( $this->formatTime( $item->getDate() ) ), "author" => $item->getAuthor() @@ -433,7 +433,7 @@ class AtomFeed extends ChannelFeed { // uses htmlentities, which does not work with XML $templateParams = [ 'language' => $this->xmlEncode( $this->getLanguage() ), - 'feedID' => $this->getFeedID(), + 'feedID' => $this->getFeedId(), 'title' => $this->getTitle(), 'url' => $this->xmlEncode( wfExpandUrl( $this->getUrlUnescaped(), PROTO_CURRENT ) ), 'selfUrl' => $this->getSelfUrl(), @@ -474,7 +474,7 @@ class AtomFeed extends ChannelFeed { // Manually escaping rather than letting Mustache do it because Mustache // uses htmlentities, which does not work with XML $templateParams = [ - "uniqueID" => $item->getUniqueId(), + "uniqueID" => $item->getUniqueID(), "title" => $item->getTitle(), "mimeType" => $this->xmlEncode( $wgMimeType ), "url" => $this->xmlEncode( wfExpandUrl( $item->getUrlUnescaped(), PROTO_CURRENT ) ), diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php index f8481fed82..79ecec691f 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Storage/RevisionStore.php @@ -190,7 +190,7 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup // rev_id is defined as NOT NULL, but this revision may not yet have been inserted. if ( !$title && $revId !== null && $revId > 0 ) { - $dbr = $this->getDbConnectionRef( $dbMode ); + $dbr = $this->getDBConnectionRef( $dbMode ); // @todo: Title::getSelectFields(), or Title::getQueryInfo(), or something like that $row = $dbr->selectRow( [ 'revision', 'page' ], diff --git a/includes/Title.php b/includes/Title.php index 9aad401ec8..c4cf434126 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1812,10 +1812,10 @@ class Title implements LinkTarget { if ( $this->isExternal() ) { $target = SpecialPage::getTitleFor( 'GoToInterwiki', - $this->getPrefixedDBKey() + $this->getPrefixedDBkey() ); } - return $target->getFullUrl( $query, false, $proto ); + return $target->getFullURL( $query, false, $proto ); } /** diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php index 375fc18936..93c35d3d23 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -397,7 +397,7 @@ class ApiComparePages extends ApiBase { if ( $rev ) { $title = $rev->getTitle(); if ( isset( $this->props['ids'] ) ) { - $vals["{$prefix}id"] = $title->getArticleId(); + $vals["{$prefix}id"] = $title->getArticleID(); $vals["{$prefix}revid"] = $rev->getId(); } if ( isset( $this->props['title'] ) ) { diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php index bb5a261728..3a1b2dbac9 100644 --- a/includes/api/ApiOptions.php +++ b/includes/api/ApiOptions.php @@ -124,7 +124,7 @@ class ApiOptions extends ApiBase { $user->setOption( $key, $value ); $changed = true; } else { - $this->addWarning( [ 'apiwarn-validationfailed', wfEscapeWikitext( $key ), $validation ] ); + $this->addWarning( [ 'apiwarn-validationfailed', wfEscapeWikiText( $key ), $validation ] ); } } diff --git a/includes/libs/mime/XmlTypeCheck.php b/includes/libs/mime/XmlTypeCheck.php index 648fb67f9f..9770515ec0 100644 --- a/includes/libs/mime/XmlTypeCheck.php +++ b/includes/libs/mime/XmlTypeCheck.php @@ -376,7 +376,7 @@ class XmlTypeCheck { if ( !$externalCallback && !$generalCallback && !$checkIfSafe ) { return; } - $dtd = $reader->readOuterXML(); + $dtd = $reader->readOuterXml(); $callbackReturn = false; if ( $generalCallback ) { -- 2.20.1