From: Reedy <reedy@wikimedia.org>
Date: Thu, 2 Aug 2012 22:35:20 +0000 (+0100)
Subject: Make rebuildLocalisationCache.php also obey --memory-limit if set.
X-Git-Tag: 1.31.0-rc.0~22856^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=d07bdcf0b3538bcef4264a7c670812946a53a0df;p=lhc%2Fweb%2Fwiklou.git

Make rebuildLocalisationCache.php also obey --memory-limit if set.

Same as https://gerrit.wikimedia.org/r/17473 for runJobs.php

Change-Id: I352df6c2f46606fe575ef5f52a39175b4aad9f75
---

diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php
index 5915a6b02d..ffe66c6c8e 100644
--- a/maintenance/rebuildLocalisationCache.php
+++ b/maintenance/rebuildLocalisationCache.php
@@ -41,6 +41,9 @@ class RebuildLocalisationCache extends Maintenance {
 	}
 
 	public function memoryLimit() {
+		if ( $this->hasOption( 'memory-limit' ) ) {
+			return parent::memoryLimit();
+		}
 		return '1000M';
 	}