<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
);
}
elseif ($installType == 'wordpress') {
- civicrm_setup(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . 'files');
+ $upload_dir = wp_upload_dir();
+ $files_dirname = $upload_dir['basedir'];
+ civicrm_setup($files_dirname);
}
$dsn = "mysql://{$config['mysql']['username']}:{$config['mysql']['password']}@{$config['mysql']['server']}/{$config['mysql']['database']}?new_link=true";
$configFile = $cmsPath . DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . $siteDir . DIRECTORY_SEPARATOR . 'civicrm.settings.php';
}
elseif ($installType == 'wordpress') {
- $configFile = $cmsPath . DIRECTORY_SEPARATOR . 'civicrm.settings.php';
+ $configFile = $files_dirname . DIRECTORY_SEPARATOR . 'civicrm' . DIRECTORY_SEPARATOR . 'civicrm.settings.php';
}
$string = civicrm_config($config);
);
$params['baseURL'] = isset($config['base_url']) ? $config['base_url'] : civicrm_cms_base();
- if ($installType == 'drupal') {
+ if ($installType == 'drupal' && defined('VERSION')) {
if (version_compare(VERSION, '7.0-rc1') >= 0) {
$params['cms'] = 'Drupal';
$params['CMSdbUser'] = addslashes($config['drupal']['username']);
$params['CMSdbName'] = addslashes($config['drupal']['database']);
}
}
+ elseif ($installType == 'drupal') {
+ $params['cms'] = $config['cms'];
+ $params['CMSdbUser'] = addslashes($config['cmsdb']['username']);
+ $params['CMSdbPass'] = addslashes($config['cmsdb']['password']);
+ $params['CMSdbHost'] = $config['cmsdb']['server'];
+ $params['CMSdbName'] = addslashes($config['cmsdb']['database']);
+ }
else {
$params['cms'] = 'WordPress';
$params['CMSdbUser'] = addslashes(DB_USER);