diff options
author | Alexander Vorwerk <zabe@avorwerk.net> | 2022-07-06 00:24:26 +0200 |
---|---|---|
committer | Zabe <zabe@avorwerk.net> | 2022-07-05 22:28:53 +0000 |
commit | 8846700ef0b43a3da926a42f2bad89f49e052aaf (patch) | |
tree | 4672910ffa6140756500f8ed82c2867f62720f2e /includes/parser/LinkHolderArray.php | |
parent | fa69b9ad8788a86c6c4da5ad8e12865ab013b54a (diff) | |
download | mediawikicore-8846700ef0b43a3da926a42f2bad89f49e052aaf.tar.gz mediawikicore-8846700ef0b43a3da926a42f2bad89f49e052aaf.zip |
Stop merging LinkCache select fields with page_title and page_namespace
LinkCache::getSelectFields() includes page_title and page_namespace
since If77c2f9879d7bae71eb59944efd8b3798d16aa46, so we don't need
to add those two specifically.
Change-Id: I8fa9d563af3f9da90fb96369dab0ee5bde860081
Diffstat (limited to 'includes/parser/LinkHolderArray.php')
-rw-r--r-- | includes/parser/LinkHolderArray.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php index 1abf96849f4b..e4088882849e 100644 --- a/includes/parser/LinkHolderArray.php +++ b/includes/parser/LinkHolderArray.php @@ -217,14 +217,9 @@ class LinkHolderArray { } } if ( !$lb->isEmpty() ) { - $fields = array_merge( - LinkCache::getSelectFields(), - [ 'page_namespace', 'page_title' ] - ); - $res = $dbr->select( 'page', - $fields, + LinkCache::getSelectFields(), $lb->constructSet( 'page', $dbr ), __METHOD__ ); @@ -417,13 +412,9 @@ class LinkHolderArray { if ( !$linkBatch->isEmpty() ) { // construct query $dbr = wfGetDB( DB_REPLICA ); - $fields = array_merge( - LinkCache::getSelectFields(), - [ 'page_namespace', 'page_title' ] - ); $varRes = $dbr->select( 'page', - $fields, + LinkCache::getSelectFields(), $linkBatch->constructSet( 'page', $dbr ), __METHOD__ ); |