X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMergeHistory.php;h=f797fe355c7e57de72a35c6e5d1b17fe37990c80;hb=c2602eaed5c726e1b78cc9ecb55a94392e923642;hp=a92056dda5abc5f932241ec5734a8656f6f46861;hpb=d42754e47722436ef52218f21a8e544a05ee9ad7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php
index a92056dda5..f797fe355c 100644
--- a/includes/MergeHistory.php
+++ b/includes/MergeHistory.php
@@ -33,7 +33,7 @@
  */
 class MergeHistory {
 
-	/** @const int Maximum number of revisions that can be merged at once (avoid too much slave lag) */
+	/** @const int Maximum number of revisions that can be merged at once */
 	const REVISION_LIMIT = 5000;
 
 	/** @var Title Page from which history will be merged */
@@ -42,7 +42,7 @@ class MergeHistory {
 	/** @var Title Page to which history will be merged */
 	protected $dest;
 
-	/** @var DatabaseBase Database that we are using */
+	/** @var IDatabase Database that we are using */
 	protected $dbw;
 
 	/** @var MWTimestamp Maximum timestamp that we can use (oldest timestamp of dest) */
@@ -51,7 +51,7 @@ class MergeHistory {
 	/** @var string SQL WHERE condition that selects source revisions to insert into destination */
 	protected $timeWhere;
 
-	/** @var MWTimestamp|boolean Timestamp upto which history from the source will be merged */
+	/** @var MWTimestamp|bool Timestamp upto which history from the source will be merged */
 	protected $timestampLimit;
 
 	/** @var integer Number of revisions merged (for Special:MergeHistory success message) */
@@ -61,7 +61,7 @@ class MergeHistory {
 	 * MergeHistory constructor.
 	 * @param Title $source Page from which history will be merged
 	 * @param Title $dest Page to which history will be merged
-	 * @param string|boolean $timestamp Timestamp up to which history from the source will be merged
+	 * @param string|bool $timestamp Timestamp up to which history from the source will be merged
 	 */
 	public function __construct( Title $source, Title $dest, $timestamp = false ) {
 		// Save the parameters