MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405386 )
Change subject: Fix called function case in a bunch of places ...................................................................... Fix called function case in a bunch of places Change-Id: If1e392290a5bab3bce389f7da692e53a748b8aff --- M includes/EditPage.php M includes/Feed.php M includes/Storage/RevisionStore.php M includes/Title.php M includes/api/ApiComparePages.php M includes/api/ApiOptions.php M includes/libs/jsminplus.php M includes/libs/mime/XmlTypeCheck.php 8 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/86/405386/1 diff --git a/includes/EditPage.php b/includes/EditPage.php index 72c3c14..5dc0720 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -3727,7 +3727,7 @@ 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 92eec08..86e9bee 100644 --- a/includes/Feed.php +++ b/includes/Feed.php @@ -88,7 +88,7 @@ * @return string */ public function getUniqueID() { - $id = $this->getUniqueIDUnescaped(); + $id = $this->getUniqueIdUnescaped(); if ( $id ) { return $this->xmlEncode( $id ); } @@ -383,7 +383,7 @@ "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 @@ // 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 @@ // 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 f8481fe..79ecec6 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Storage/RevisionStore.php @@ -190,7 +190,7 @@ // 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 9aad401..c4cf434 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1812,10 +1812,10 @@ 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 375fc18..93c35d3 100644 --- a/includes/api/ApiComparePages.php +++ b/includes/api/ApiComparePages.php @@ -397,7 +397,7 @@ 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 bb5a261..3a1b2db 100644 --- a/includes/api/ApiOptions.php +++ b/includes/api/ApiOptions.php @@ -124,7 +124,7 @@ $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/jsminplus.php b/includes/libs/jsminplus.php index e3c2d75..35371b4 100644 --- a/includes/libs/jsminplus.php +++ b/includes/libs/jsminplus.php @@ -1573,7 +1573,7 @@ private function nest($x, $node, $end = false) { array_push($x->stmtStack, $node); - $n = $this->statement($x); + $n = $this->Statement($x); array_pop($x->stmtStack); if ($end) diff --git a/includes/libs/mime/XmlTypeCheck.php b/includes/libs/mime/XmlTypeCheck.php index 648fb67..9770515 100644 --- a/includes/libs/mime/XmlTypeCheck.php +++ b/includes/libs/mime/XmlTypeCheck.php @@ -376,7 +376,7 @@ if ( !$externalCallback && !$generalCallback && !$checkIfSafe ) { return; } - $dtd = $reader->readOuterXML(); + $dtd = $reader->readOuterXml(); $callbackReturn = false; if ( $generalCallback ) { -- To view, visit https://gerrit.wikimedia.org/r/405386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1e392290a5bab3bce389f7da692e53a748b8aff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MaxSem <maxsem.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits