Use LinkCache::getSelectFields() in OutputPage::addCategoryLinks()
authorKunal Mehta <legoktm@member.fsf.org>
Tue, 7 Jun 2016 23:37:27 +0000 (16:37 -0700)
committerKunal Mehta <legoktm@member.fsf.org>
Tue, 7 Jun 2016 23:37:27 +0000 (16:37 -0700)
Change-Id: I71d95cbb6c22ae92586c883e7de5353d26c4838f

includes/OutputPage.php

index 6f62ae6..ad7c976 100644 (file)
@@ -1277,15 +1277,10 @@ class OutputPage extends ContextSource {
 
                # Fetch existence plus the hiddencat property
                $dbr = wfGetDB( DB_SLAVE );
-               $fields = [ 'page_id', 'page_namespace', 'page_title', 'page_len',
-                       'page_is_redirect', 'page_latest', 'pp_value' ];
-
-               if ( $this->getConfig()->get( 'ContentHandlerUseDB' ) ) {
-                       $fields[] = 'page_content_model';
-               }
-               if ( $this->getConfig()->get( 'PageLanguageUseDB' ) ) {
-                       $fields[] = 'page_lang';
-               }
+               $fields = array_merge(
+                       LinkCache::getSelectFields(),
+                       [ 'page_namespace', 'page_title', 'pp_value' ]
+               );
 
                $res = $dbr->select( [ 'page', 'page_props' ],
                        $fields,