Merge "Fix sessionfailure i18n message during authentication"

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6bf3c89..6fbeed7 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2798,7 +2798,8 @@ ERROR;
 
                if ( $this->wasDeletedSinceLastEdit() && 'save' == $this->formtype ) {
                        $username = $this->lastDelete->user_name;
-                       $comment = CommentStore::newKey( 'log_comment' )->getComment( $this->lastDelete )->text;
+                       $comment = CommentStore::getStore()
+                               ->getComment( 'log_comment', $this->lastDelete )->text;
 
                        // It is better to not parse the comment at all than to have templates expanded in the middle
                        // TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used?
@@ -3810,7 +3811,7 @@ ERROR;
         */
        protected function getLastDelete() {
                $dbr = wfGetDB( DB_REPLICA );
-               $commentQuery = CommentStore::newKey( 'log_comment' )->getJoin();
+               $commentQuery = CommentStore::getStore()->getJoin( 'log_comment' );
                $data = $dbr->selectRow(
                        [ 'logging', 'user' ] + $commentQuery['tables'],
                        [