projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5.26.0 release notes: added boilerplate
[civicrm-core.git]
/
install
/
civicrm.php
diff --git
a/install/civicrm.php
b/install/civicrm.php
index 3bd68119aa52e89241228a15d3650a75df7b08e6..0932b1902b58e85622a2632f580a9278ac00adea 100644
(file)
--- a/
install/civicrm.php
+++ b/
install/civicrm.php
@@
-67,7
+67,7
@@
function civicrm_main(&$config) {
global $sqlPath, $crmPath, $cmsPath, $installType;
if ($installType == 'drupal') {
global $sqlPath, $crmPath, $cmsPath, $installType;
if ($installType == 'drupal') {
- $siteDir =
isset($config['site_dir']) ? $config['site_dir'] :
getSiteDir($cmsPath, $_SERVER['SCRIPT_FILENAME']);
+ $siteDir =
$config['site_dir'] ??
getSiteDir($cmsPath, $_SERVER['SCRIPT_FILENAME']);
civicrm_setup($cmsPath . DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . $siteDir . DIRECTORY_SEPARATOR . 'files'
);
}
civicrm_setup($cmsPath . DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . $siteDir . DIRECTORY_SEPARATOR . 'files'
);
}
@@
-212,7
+212,7
@@
function civicrm_config(&$config) {
'dbName' => addslashes($config['mysql']['database']),
);
'dbName' => addslashes($config['mysql']['database']),
);
- $params['baseURL'] =
isset($config['base_url']) ? $config['base_url'] :
civicrm_cms_base();
+ $params['baseURL'] =
$config['base_url'] ??
civicrm_cms_base();
if ($installType == 'drupal' && defined('VERSION')) {
if (version_compare(VERSION, '8.0') >= 0) {
$params['cms'] = 'Drupal';
if ($installType == 'drupal' && defined('VERSION')) {
if (version_compare(VERSION, '8.0') >= 0) {
$params['cms'] = 'Drupal';