From c59c0e215c932f96614359f96d2cf5dd90b7bc10 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 13:37:01 -0800 Subject: [PATCH] INFRA-132 - xml/ - phpcbf --- xml/GenCode.php | 26 +++++++++++++------------- xml/plugins/block.ts.php | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/xml/GenCode.php b/xml/GenCode.php index e2ca3fa7bc..9a2fb79bd6 100644 --- a/xml/GenCode.php +++ b/xml/GenCode.php @@ -5,13 +5,13 @@ $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; + case 'g': $memLimit *= 1024; + case 'm': $memLimit *= 1024; + case 'k': $memLimit *= 1024; } if ($memLimit >= 0 and $memLimit < 536870912) { - ini_set('memory_limit', '512M'); + ini_set('memory_limit', '512M'); } date_default_timezone_set('UTC'); // avoid php warnings if timezone is not set - CRM-10844 @@ -22,14 +22,14 @@ CRM_Core_ClassLoader::singleton()->register(); # TODO: pull these settings from configuration $genCode = new CRM_Core_CodeGen_Main( - '../CRM/Core/DAO/', // $CoreDAOCodePath - '../sql/', // $sqlCodePath - '../', // $phpCodePath - '../templates/', // $tplCodePath - array('../packages/Smarty/plugins', '../CRM/Core/Smarty/plugins'), // smarty plugin dirs - @$argv[3], // cms - empty($argv[2]) ? NULL : $argv[2], // db version - empty($argv[1]) ? 'schema/Schema.xml' : $argv[1], // schema file + '../CRM/Core/DAO/', // $CoreDAOCodePath + '../sql/', // $sqlCodePath + '../', // $phpCodePath + '../templates/', // $tplCodePath + array('../packages/Smarty/plugins', '../CRM/Core/Smarty/plugins'), // smarty plugin dirs + @$argv[3], // cms + empty($argv[2]) ? NULL : $argv[2], // db version + empty($argv[1]) ? 'schema/Schema.xml' : $argv[1], // schema file getenv('CIVICRM_GENCODE_DIGEST') ? getenv('CIVICRM_GENCODE_DIGEST') : NULL // path to digest file ); -$genCode->main(); \ No newline at end of file +$genCode->main(); diff --git a/xml/plugins/block.ts.php b/xml/plugins/block.ts.php index 56fbe713ba..a610ec0901 100644 --- a/xml/plugins/block.ts.php +++ b/xml/plugins/block.ts.php @@ -9,4 +9,3 @@ function smarty_block_ts($params, $text, &$smarty) { return ts($text, $params); } - -- 2.25.1