Merge "Make OrphanStats::getDB()'s signature compatible with parent."

diff --git a/CREDITS b/CREDITS
index aa55af9..5ceccc5 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -125,7 +125,7 @@ following names for their contribution to the product.
 * Jimmy Xu
 * Jonathan Wiltshire
 * John N
-* Karun Dambietz
+* Karun Dambiec
 * Kim Hyun-Joon
 * Krenair
 * Lee Worden

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 89aca98..c22c04b 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -308,8 +308,7 @@ class HistoryAction extends FormlessAction {
                                $rev->getUserText(),
                                $wgContLang->timeanddate( $rev->getTimestamp() ),
                                $wgContLang->date( $rev->getTimestamp() ),
-                               $wgContLang->time( $rev->getTimestamp() )->inContentLanguage()->text()
-                       );
+                               $wgContLang->time( $rev->getTimestamp() ) )->inContentLanguage()->text();
                } else {
                        $title = $rev->getUserText() .
                        wfMessage( 'colon-separator' )->inContentLanguage()->text() .