Fixed a bug where model termination would not work immediately if ter…

…minate() was called in constructor

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http:https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http:https://semver.org/spec/v2.0.0.html).
 
+# Unreleased
+
+## [terminated-hotfix] - 2021-11-04
+
+### Fixed
+- A bug where model termination would not work immediately if `terminate()` was called in constructor.
+
 # Released
 
 ## [1.34.4] - 2021-10-14

classes/model.php

@@ -320,6 +320,10 @@ public function fetch_data( $functions = null, $tidy = false ) {
  // Loop through all public methods and run the ones we wanted to deliver the data to the views.
  foreach ( $methods as $class => $class_methods ) {
  foreach ( $class_methods as $name => $m ) {
+ if ( $this->terminated ) {
+ break 2;
+ }
+
  if ( $perf_monitoring_enabled ) {
  $perf_key = $this->perf_key( $m );
  dustpress()->start_performance( $perf_key );
@@ -374,10 +378,6 @@ public function fetch_data( $functions = null, $tidy = false ) {
  if ( $perf_monitoring_enabled ) {
  dustpress()->save_performance( $perf_key );
  }
-
- if ( $this->terminated ) {
- break 2;
- }
  }
 
  unset( $class_methods );