Converted Exception to Throwable in Mage_Core_Block_Template. (#2623)

kiatng · web-flow · commit c5c34fc85948 · 2022-09-28T08:28:15.000+01:00
diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php
@@ -259,9 +259,12 @@ public function fetchView($fileName)
                 $thisClass = get_class($this);
                 Mage::log('Not valid template file:' . $fileName . ' class: ' . $thisClass, Zend_Log::CRIT, null, true);
             }
-        } catch (Exception $e) {
+        } catch (Throwable $e) {
             ob_get_clean();
-            throw $e;
+            if (Mage::getIsDeveloperMode()) {
+                throw $e;
+            }
+            Mage::logException($e);
         }
 
         if ($hints) {

Original file line number	Diff line number	Diff line change
`@@ -259,9 +259,12 @@ public function fetchView($fileName)`
`259`	`259`	`$thisClass = get_class($this);`
`260`	`260`	`Mage::log('Not valid template file:' . $fileName . ' class: ' . $thisClass, Zend_Log::CRIT, null, true);`
`261`	`261`	`}`
`262`		`- } catch (Exception $e) {`
	`262`	`+ } catch (Throwable $e) {`
`263`	`263`	`ob_get_clean();`
`264`		`- throw $e;`
	`264`	`+ if (Mage::getIsDeveloperMode()) {`
	`265`	`+ throw $e;`
	`266`	`+ }`
	`267`	`+ Mage::logException($e);`
`265`	`268`	`}`
`266`	`269`
`267`	`270`	`if ($hints) {`