X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecials%2FSpecialNewpages.php;h=e2c9eab1ce075cddcb1655a4d43f566d2fb689f4;hp=83482f6f2fba777d5a7f0860aede2d168cbc856d;hb=89539f2aa1b158fdcc703ad053e2580cb97a6385;hpb=af1434ff2feaf132e96e9a00acf0818944692a61 diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 83482f6f2f..e2c9eab1ce 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -293,6 +293,19 @@ class SpecialNewpages extends IncludableSpecialPage { ); } + /** + * @param stdClass $row Result row from recent changes + * @return Revision|bool + */ + protected function revisionFromRcResult( stdClass $result ) { + return new Revision( [ + 'comment' => $result->rc_comment, + 'deleted' => $result->rc_deleted, + 'user_text' => $result->rc_user_text, + 'user' => $result->rc_user, + ] ); + } + /** * Format a row, providing the timestamp, links to the page/history, * size, user links, and a comment @@ -303,14 +316,9 @@ class SpecialNewpages extends IncludableSpecialPage { public function formatRow( $result ) { $title = Title::newFromRow( $result ); - # Revision deletion works on revisions, so we should cast one - $row = [ - 'comment' => $result->rc_comment, - 'deleted' => $result->rc_deleted, - 'user_text' => $result->rc_user_text, - 'user' => $result->rc_user, - ]; - $rev = new Revision( $row ); + // Revision deletion works on revisions, + // so cast our recent change row to a revision row. + $rev = $this->revisionFromRcResult( $result ); $rev->setTitle( $title ); $classes = []; @@ -485,7 +493,7 @@ class SpecialNewpages extends IncludableSpecialPage { } protected function feedItemDesc( $row ) { - $revision = Revision::newFromId( $row->rev_id ); + $revision = $this->revisionFromRcResult( $row ); if ( $revision ) { // XXX: include content model/type in feed item? return '

' . htmlspecialchars( $revision->getUserText() ) .