* (bug 38953) --memory-limit switch not working for runJobs.php.

In runJobs.php the memory limit was hardcoded to 150M, so passing
--memory-limit would have no difference. Changed to using what was
passed as --memory-limit if something was, else just use the 150M
as usual

Change-Id: I3e3bafc6a0fe4e88792a65f01b432c8f4f6677cf

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 9e17daf..3a14f55 100644 (file)
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -188,6 +188,7 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 25095) Special:Categories should also include the first relevant item
   when "from" is filled.
 * (bug 35526) jquery.tablesorter now uses a stable sort.
+* (bug 38953) --memory-limit switch not working for runJobs.php.
 
 === API changes in 1.20 ===
 * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API.

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index 946ee2b..fdc141b 100644 (file)
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -37,6 +37,9 @@ class RunJobs extends Maintenance {
        }
 
        public function memoryLimit() {
+               if ( $this->hasOption( 'memory-limit' ) ) {
+                       return parent::memoryLimit();
+               }
                // Don't eat all memory on the machine if we get a bad job.
                return "150M";
        }