Remove our override of Smartyv2 fetch function

diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php
index b5c22c62df572f335de727f87beffb481f90e4d3..f3773337f65ae77ab52e0a91d0b87f350889f589 100644 (file)
--- a/CRM/Core/Smarty.php
+++ b/CRM/Core/Smarty.php
@@ -183,35 +183,6 @@ class CRM_Core_Smarty extends Smarty {
     return self::$_singleton;
   }
 
-  /**
-   * Executes & returns or displays the template results
-   *
-   * @param string $resource_name
-   * @param string $cache_id
-   * @param string $compile_id
-   * @param bool $display
-   *
-   * @return bool|mixed|string
-   *
-   * @noinspection PhpDocMissingThrowsInspection
-   * @noinspection PhpUnhandledExceptionInspection
-   */
-  public function fetch($resource_name, $cache_id = NULL, $compile_id = NULL, $display = FALSE) {
-    if (preg_match('/^(\s+)?string:/', $resource_name)) {
-      $old_security = $this->security;
-      $this->security = TRUE;
-    }
-    try {
-      $output = parent::fetch($resource_name, $cache_id, $compile_id, $display);
-    }
-    finally {
-      if (isset($old_security)) {
-        $this->security = $old_security;
-      }
-    }
-    return $output;
-  }
-
   /**
    * Handle smarty error in one off string.
    *