Respect 'exit()' in callback (#151)

atk4 · Apr 28, 2017 · 2108eac · 2108eac
1 parent 168cdbe
commit 2108eac
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Callback.php b/src/Callback.php
@@ -70,13 +70,23 @@ public function set($callback, $args = [])
             if (isset($_POST[$this->name])) {
                 $this->triggered = $_POST[$this->name];
 
-                return call_user_func_array($callback, $args);
+                $t = $this->app->run_called;
+                $this->app->run_called = true;
+                $ret = call_user_func_array($callback, $args);
+                $this->app->run_called = $t;
+
+                return $ret;
             }
         } else {
             if (isset($_GET[$this->name])) {
                 $this->triggered = $_GET[$this->name];
 
-                return call_user_func_array($callback, $args);
+                $t = $this->app->run_called;
+                $this->app->run_called = true;
+                $ret = call_user_func_array($callback, $args);
+                $this->app->run_called = $t;
+
+                return $ret;
             }
         }
     }