Merge pull request #4009 from eileenmcnaughton/CRM-15210

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

diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php
index 43aab01c20eef5d721fa38473d6d86789d3474c7..6422ca2c489ac59884a160adcaaff16ae972e333 100644 (file)
--- a/CRM/Core/Smarty.php
+++ b/CRM/Core/Smarty.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -159,6 +159,7 @@ class CRM_Core_Smarty extends Smarty {
     }
 
     $this->register_function('crmURL', array('CRM_Utils_System', 'crmURL'));
+    $this->load_filter('pre', 'resetExtScope');
   }
 
   /**
@@ -186,7 +187,15 @@ class CRM_Core_Smarty extends Smarty {
    * @param boolean $display
    */
   function fetch($resource_name, $cache_id = NULL, $compile_id = NULL, $display = FALSE) {
-    return parent::fetch($resource_name, $cache_id, $compile_id, $display);
+    if (preg_match( '/^(\s+)?string:/', $resource_name)) {
+      $old_security = $this->security;
+      $this->security = TRUE;
+    }
+    $output = parent::fetch($resource_name, $cache_id, $compile_id, $display);
+    if (isset($old_security)) {
+      $this->security = $old_security;
+    }
+    return $output;
   }
 
   function appendValue($name, $value) {