Merge pull request #5760 from sudhabisht/SMSissue

[civicrm-core.git] / CRM / Core / Smarty.php

diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php
index caf5925d5dc97c3ad7172bfe5f8e675f399f6a08..7553d4ae86da63cf81051811312320b20b67307e 100644 (file)
--- a/CRM/Core/Smarty.php
+++ b/CRM/Core/Smarty.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | 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$
  *
  */
@@ -69,7 +69,6 @@ class CRM_Core_Smarty extends Smarty {
    * pattern and cache the instance in this variable
    *
    * @var object
-   * @static
    */
   static private $_singleton = NULL;
 
@@ -79,7 +78,7 @@ class CRM_Core_Smarty extends Smarty {
   private $backupFrames = array();
 
   /**
-   * Class constructor
+   * Class constructor.
    *
    * @return CRM_Core_Smarty
    */
@@ -118,12 +117,12 @@ class CRM_Core_Smarty extends Smarty {
 
     $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;
       }
@@ -142,20 +141,6 @@ class CRM_Core_Smarty extends Smarty {
     $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);
 
@@ -178,8 +163,8 @@ class CRM_Core_Smarty extends Smarty {
    */
   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();
     }
@@ -197,7 +182,7 @@ class CRM_Core_Smarty extends Smarty {
    * @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;
     }
@@ -265,11 +250,11 @@ class CRM_Core_Smarty extends Smarty {
    * @param $path
    */
   public function addTemplateDir($path) {
-    if ( is_array( $this->template_dir ) ) {
-      array_unshift( $this->template_dir, $path );
+    if (is_array($this->template_dir)) {
+      array_unshift($this->template_dir, $path);
     }
     else {
-      $this->template_dir = array( $path, $this->template_dir );
+      $this->template_dir = array($path, $this->template_dir);
     }
 
   }
@@ -326,4 +311,5 @@ class CRM_Core_Smarty extends Smarty {
     }
     return $this;
   }
+
 }