Commit 94dbed1f authored by totten's avatar totten

CRM-16373 - Config - Remove `smartyDir`, `pluginsDir`, and `sqlDir`

parent 61c920e7
......@@ -45,17 +45,10 @@ class CRM_Core_Config_Defaults {
public function setCoreVariables() {
global $civicrm_root;
// set of base directories relying on $civicrm_root
$this->smartyDir = $civicrm_root . DIRECTORY_SEPARATOR . 'packages' . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR;
$this->pluginsDir = $civicrm_root . DIRECTORY_SEPARATOR . 'CRM' . DIRECTORY_SEPARATOR . 'Core' . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR;
$this->templateDir = array(
$civicrm_root . DIRECTORY_SEPARATOR .
'templates' . DIRECTORY_SEPARATOR,
);
$this->sqlDir = $civicrm_root . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
}
/**
......
......@@ -44,13 +44,6 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
public $debug = 0;
public $backtrace = 0;
/**
* The directory where Smarty and plugins are installed.
* @var string
*/
public $smartyDir = NULL;
public $pluginsDir = NULL;
/**
* The root directory of our template tree.
* @var string
......
......@@ -128,11 +128,14 @@ class CRM_Core_Smarty extends Smarty {
}
}
$smartyDir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'packages' . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR;
$pluginsDir = __DIR__ . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR;
if ($customPluginsDir) {
$this->plugins_dir = array($customPluginsDir, $config->smartyDir . 'plugins', $config->pluginsDir);
$this->plugins_dir = array($customPluginsDir, $smartyDir . 'plugins', $pluginsDir);
}
else {
$this->plugins_dir = array($config->smartyDir . 'plugins', $config->pluginsDir);
$this->plugins_dir = array($smartyDir . 'plugins', $pluginsDir);
}
// add the session and the config here
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment