From: Max Semenik Date: Fri, 29 Mar 2019 23:20:50 +0000 (-0700) Subject: Fix function/class case X-Git-Tag: 1.34.0-rc.0~2201^2~2 X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=4004d3d868831a614b021a4ec1d315faa51ca56d;p=lhc%2Fweb%2Fwiklou.git Fix function/class case Change-Id: I18c205736be9d76d2c09a6dc4d7377740a742ccc --- diff --git a/includes/Block.php b/includes/Block.php index b17ec86666..58ef4488dd 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -1297,7 +1297,7 @@ class Block { // their own talk page unless a restriction exists on the // page or User_talk: namespace wfSetVar( $this->allowUsertalk, $x === null ? null : !$x ); - $res = !$this->isUserTalkEditAllowed(); + $res = !$this->isUsertalkEditAllowed(); // edit own user talk can be disabled by config if ( !$blockAllowsUTEdit ) { diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php index 632bd31286..7dd4eead17 100644 --- a/includes/Revision/RevisionStore.php +++ b/includes/Revision/RevisionStore.php @@ -827,11 +827,11 @@ class RevisionStore // And we have to use raw SQL to bypass the "aggregation used with a locking SELECT" warning // that's for non-MySQL DBs. $row1 = $dbw->query( - $dbw->selectSqlText( 'archive', [ 'v' => "MAX(ar_rev_id)" ], '', __METHOD__ ) . ' FOR UPDATE' + $dbw->selectSQLText( 'archive', [ 'v' => "MAX(ar_rev_id)" ], '', __METHOD__ ) . ' FOR UPDATE' )->fetchObject(); if ( $this->hasMcrSchemaFlags( SCHEMA_COMPAT_WRITE_NEW ) ) { $row2 = $dbw->query( - $dbw->selectSqlText( 'slots', [ 'v' => "MAX(slot_revision_id)" ], '', __METHOD__ ) + $dbw->selectSQLText( 'slots', [ 'v' => "MAX(slot_revision_id)" ], '', __METHOD__ ) . ' FOR UPDATE' )->fetchObject(); } else { diff --git a/includes/Title.php b/includes/Title.php index ce0b9595c5..0c62c4ff3f 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -4806,7 +4806,7 @@ class Title implements LinkTarget, IDBAccessObject { $dbw->onTransactionPreCommitOrIdle( function () use ( $dbw ) { ResourceLoaderWikiModule::invalidateModuleCache( - $this, null, null, $dbw->getDomainId() ); + $this, null, null, $dbw->getDomainID() ); }, __METHOD__ ); diff --git a/includes/actions/McrUndoAction.php b/includes/actions/McrUndoAction.php index 47bbdc0b5c..b0f89dcf85 100644 --- a/includes/actions/McrUndoAction.php +++ b/includes/actions/McrUndoAction.php @@ -298,7 +298,7 @@ class McrUndoAction extends FormAction { 'class' => 'mw-content-' . $pageViewLang->getDir() ]; $previewHTML = Html::rawElement( 'div', $attribs, $previewHTML ); - $out->addHtml( $previewhead . $previewHTML ); + $out->addHTML( $previewhead . $previewHTML ); } public function onSubmit( $data ) { diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php index c8f1a8d2f0..c9d0ae968f 100644 --- a/includes/actions/RawAction.php +++ b/includes/actions/RawAction.php @@ -119,7 +119,7 @@ class RawAction extends FormlessAction { "Unsafe JS/CSS/Json {$elevatedText}load - {user} loaded {title} with {ctype}", [ 'user' => $this->getUser()->getName(), - 'title' => $title->getPrefixedDBKey(), + 'title' => $title->getPrefixedDBkey(), 'ctype' => $contentType, 'elevated' => $elevated ] @@ -147,7 +147,7 @@ class RawAction extends FormlessAction { $log->info( "Blocked loading unprotected JS {title} for {user}", [ 'user' => $this->getUser()->getName(), - 'title' => $title->getPrefixedDBKey(), + 'title' => $title->getPrefixedDBkey(), ] ); throw new HttpError( 403, wfMessage( 'unprotected-js' ) ); diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index 7e8041d667..0e13d705ff 100644 --- a/includes/api/ApiDelete.php +++ b/includes/api/ApiDelete.php @@ -75,7 +75,7 @@ class ApiDelete extends ApiBase { $status = self::delete( $pageObj, $user, $reason, $params['tags'] ); } - if ( !$status->isOk() ) { + if ( !$status->isOK() ) { $this->dieStatus( $status ); } $this->addMessagesFromStatus( $status, [ 'warning' ], [ 'delete-scheduled' ] ); diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index 21e46457d0..1fd21d08c6 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -1027,7 +1027,7 @@ class LoadBalancer implements ILoadBalancer { } unset( $this->conns[$connFreeKey][$i][$oldDomain] ); // Note that if $domain is an empty string, getDomainID() might not match it - $this->conns[$connInUseKey][$i][$conn->getDomainId()] = $conn; + $this->conns[$connInUseKey][$i][$conn->getDomainID()] = $conn; $this->connLogger->debug( __METHOD__ . ": reusing free connection from $oldDomain for $domain" ); break; diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 529c33185e..3fabfd214c 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -456,7 +456,7 @@ class SpecialUndelete extends SpecialPage { Message::rawParam( $link ), $time, Message::rawParam( $userLink ), $d, $t ); - $out->addHtml( '' ); + $out->addHTML( '' ); if ( !Hooks::run( 'UndeleteShowRevision', [ $this->mTargetObj, $rev ] ) ) { return; diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php index 2fc946efe0..496013b58c 100644 --- a/includes/specials/pagers/BlockListPager.php +++ b/includes/specials/pagers/BlockListPager.php @@ -261,7 +261,7 @@ class BlockListPager extends TablePager { switch ( $restriction->getType() ) { case PageRestriction::TYPE: if ( $restriction->getTitle() ) { - $items[$restriction->getType()][] = HTML::rawElement( + $items[$restriction->getType()][] = Html::rawElement( 'li', [], Linker::link( $restriction->getTitle() ) @@ -274,7 +274,7 @@ class BlockListPager extends TablePager { : $this->getLanguage()->getFormattedNsText( $restriction->getValue() ); - $items[$restriction->getType()][] = HTML::rawElement( + $items[$restriction->getType()][] = Html::rawElement( 'li', [], Linker::link(