Merge "Remove use of implicitGroupby() in WikiPage"

diff --combined includes/page/WikiPage.php
index bbf22ba,29ee533..c04eb0a
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -213,7 -213,6 +213,7 @@@ class WikiPage implements Page, IDBAcce
         * @todo Move this UI stuff somewhere else
         *
         * @see ContentHandler::getActionOverrides
 +       * @return array
         */
        public function getActionOverrides() {
                return $this->getContentHandler()->getActionOverrides();
@@@ -983,18 -982,12 +983,12 @@@
  
                $dbr = wfGetDB( DB_REPLICA );
  
-               if ( $dbr->implicitGroupby() ) {
-                       $realNameField = 'user_real_name';
-               } else {
-                       $realNameField = 'MIN(user_real_name) AS user_real_name';
-               }
- 
                $tables = [ 'revision', 'user' ];
  
                $fields = [
                        'user_id' => 'rev_user',
                        'user_name' => 'rev_user_text',
-                       $realNameField,
+                       'user_real_name' => 'MIN(user_real_name)',
                        'timestamp' => 'MAX(rev_timestamp)',
                ];
  
@@@ -1071,8 -1064,7 +1065,8 @@@
                }
  
                if ( $useParserCache ) {
 -                      $parserOutput = ParserCache::singleton()->get( $this, $parserOptions );
 +                      $parserOutput = MediaWikiServices::getInstance()->getParserCache()
 +                              ->get( $this, $parserOptions );
                        if ( $parserOutput !== false ) {
                                return $parserOutput;
                        }
@@@ -1921,10 -1913,10 +1915,10 @@@
                                        $wikiPage = $this;
                                        // Trigger post-create hook
                                        $params = [ &$wikiPage, &$user, $content, $summary,
 -                                              $flags & EDIT_MINOR, null, null, &$flags, $revision ];
 +                                                              $flags & EDIT_MINOR, null, null, &$flags, $revision ];
                                        Hooks::run( 'PageContentInsertComplete', $params );
                                        // Trigger post-save hook
 -                                      $params = array_merge( $params, [ &$status, $meta['baseRevId'] ] );
 +                                      $params = array_merge( $params, [ &$status, $meta['baseRevId'], 0 ] );
                                        Hooks::run( 'PageContentSaveComplete', $params );
                                }
                        ),
@@@ -2164,7 -2156,7 +2158,7 @@@
  
                // Save it to the parser cache.
                // Make sure the cache time matches page_touched to avoid double parsing.
 -              ParserCache::singleton()->save(
 +              MediaWikiServices::getInstance()->getParserCache()->save(
                        $editInfo->output, $this, $editInfo->popts,
                        $revision->getTimestamp(), $editInfo->revid
                );
@@@ -2734,7 -2726,6 +2728,7 @@@
         * @param array|string &$error Array of errors to append to
         * @param User $user The deleting user
         * @param array $tags Tags to apply to the deletion action
 +       * @param string $logsubtype
         * @return Status Status object; if successful, $status->value is the log_id of the
         *   deletion log entry. If the page couldn't be deleted because it wasn't
         *   found, $status is a non-fatal 'cannotdelete' error