+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014 |
+ | Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
-*/
+ */
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
* $Id$
*
*/
* pattern and cache the instance in this variable
*
* @var object
- * @static
*/
static private $_singleton = NULL;
private $backupFrames = array();
/**
- * Class constructor
+ * Class constructor.
*
* @return CRM_Core_Smarty
*/
parent::__construct();
}
- private function initialize( ) {
+ private function initialize() {
$config = CRM_Core_Config::singleton();
if (isset($config->customTemplateDir) && $config->customTemplateDir) {
$customPluginsDir = NULL;
if (isset($config->customPHPPathDir)) {
- $customPluginsDir =
- $config->customPHPPathDir . DIRECTORY_SEPARATOR .
- 'CRM' . DIRECTORY_SEPARATOR .
- 'Core' . DIRECTORY_SEPARATOR .
- 'Smarty' . DIRECTORY_SEPARATOR .
- 'plugins' . DIRECTORY_SEPARATOR;
+ $customPluginsDir
+ = $config->customPHPPathDir . DIRECTORY_SEPARATOR .
+ 'CRM' . DIRECTORY_SEPARATOR .
+ 'Core' . DIRECTORY_SEPARATOR .
+ 'Smarty' . DIRECTORY_SEPARATOR .
+ 'plugins' . DIRECTORY_SEPARATOR;
if (!file_exists($customPluginsDir)) {
$customPluginsDir = NULL;
}
$this->assign_by_ref('config', $config);
$this->assign_by_ref('session', $session);
- // check default editor and assign to template
- $defaultWysiwygEditor = $session->get('defaultWysiwygEditor');
- if (!$defaultWysiwygEditor && !CRM_Core_Config::isUpgradeMode()) {
- $defaultWysiwygEditor = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
- 'editor_id'
- );
- // For logged-in users, store it in session to reduce db calls
- if ($session->get('userID')) {
- $session->set('defaultWysiwygEditor', $defaultWysiwygEditor);
- }
- }
-
- $this->assign('defaultWysiwygEditor', $defaultWysiwygEditor);
-
global $tsLocale;
$this->assign('tsLocale', $tsLocale);
*/
public static function &singleton() {
if (!isset(self::$_singleton)) {
- self::$_singleton = new CRM_Core_Smarty( );
- self::$_singleton->initialize( );
+ self::$_singleton = new CRM_Core_Smarty();
+ self::$_singleton->initialize();
self::registerStringResource();
}
* @return bool|mixed|string
*/
public function fetch($resource_name, $cache_id = NULL, $compile_id = NULL, $display = FALSE) {
- if (preg_match( '/^(\s+)?string:/', $resource_name)) {
+ if (preg_match('/^(\s+)?string:/', $resource_name)) {
$old_security = $this->security;
$this->security = TRUE;
}
$this->pushScope($vars);
try {
$result = $this->fetch($resource_name);
- } catch (Exception $e) {
+ }
+ catch (Exception $e) {
// simulate try { ... } finally { ... }
$this->popScope();
throw $e;
* @param $path
*/
public function addTemplateDir($path) {
- if ( is_array( $this->template_dir ) ) {
- array_unshift( $this->template_dir, $path );
- } else {
- $this->template_dir = array( $path, $this->template_dir );
+ if (is_array($this->template_dir)) {
+ array_unshift($this->template_dir, $path);
+ }
+ else {
+ $this->template_dir = array($path, $this->template_dir);
}
}
}
return $this;
}
+
}