From 9ece6350c8e873c462901fb974b17c1f09227dd9 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 23 Sep 2023 13:50:58 +1200
Subject: [PATCH] Remove our override of Smartyv2 fetch function

---
 CRM/Core/Smarty.php | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php
index b5c22c62df..f3773337f6 100644
--- 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.
    *
-- 
2.25.1