projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #16528 from mattwire/removeoldflexmailer
[civicrm-core.git]
/
xml
/
GenCode.php
diff --git
a/xml/GenCode.php
b/xml/GenCode.php
index cee7f1475a5df5da572df96fdb93fb333a6454bd..78661a911143166a24450c47dfcc68b41dc18c05 100644
(file)
--- a/
xml/GenCode.php
+++ b/
xml/GenCode.php
@@
-4,7
+4,8
@@
if (PHP_SAPI !== 'cli') {
die("GenCode can only be run from command line.");
}
die("GenCode can only be run from command line.");
}
-ini_set('include_path', '.' . PATH_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'packages' . PATH_SEPARATOR . '..');
+$includes = ['.', '../packages', '../../civicrm-packages', '..'];
+ini_set('include_path', implode(PATH_SEPARATOR, $includes));
// make sure the memory_limit is at least 512 MB
$memLimitString = trim(ini_get('memory_limit'));
$memLimitUnit = strtolower(substr($memLimitString, -1));
// make sure the memory_limit is at least 512 MB
$memLimitString = trim(ini_get('memory_limit'));
$memLimitUnit = strtolower(substr($memLimitString, -1));
@@
-27,6
+28,7
@@
date_default_timezone_set('UTC');
define('CIVICRM_UF', 'Drupal');
define('CIVICRM_UF_BASEURL', '/');
define('CIVICRM_UF', 'Drupal');
define('CIVICRM_UF_BASEURL', '/');
+define('CIVICRM_L10N_BASEDIR', getenv('CIVICRM_L10N_BASEDIR') ? getenv('CIVICRM_L10N_BASEDIR') : __DIR__ . '/../l10n');
require_once 'CRM/Core/ClassLoader.php';
CRM_Core_ClassLoader::singleton()->register();
require_once 'CRM/Core/ClassLoader.php';
CRM_Core_ClassLoader::singleton()->register();