From: eileen <eileen@fuzion.co.nz>
Date: Fri, 10 May 2013 08:10:01 +0000 (+1200)
Subject: GenCode shouldn't reduce memory_limit
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0d0352061030b482e2337c252e54e9ad079384db;p=civicrm-core.git

GenCode shouldn't reduce memory_limit
---

diff --git a/xml/GenCode.php b/xml/GenCode.php
index 2306149725..b59c5ce6c4 100644
--- a/xml/GenCode.php
+++ b/xml/GenCode.php
@@ -1,6 +1,18 @@
 <?php
 ini_set('include_path', '.' . PATH_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'packages' . PATH_SEPARATOR . '..');
-ini_set('memory_limit', '512M');
+// make sure the memory_limit is at least 512 MB
+$memLimitString = trim(ini_get('memory_limit'));
+$memLimitUnit   = strtolower(substr($memLimitString, -1));
+$memLimit       = (int) $memLimitString;
+switch ($memLimitUnit) {
+    case 'g': $memLimit *= 1024;
+    case 'm': $memLimit *= 1024;
+    case 'k': $memLimit *= 1024;
+}
+
+if ($memLimit >= 0 and $memLimit < 536870912) {
+    ini_set('memory_limit', '512M');
+}
 date_default_timezone_set('UTC'); // avoid php warnings if timezone is not set - CRM-10844
 
 define('CIVICRM_UF', 'Drupal');