diff --git a/flight/Engine.php b/flight/Engine.php index ca185d6..19c6064 100644 --- a/flight/Engine.php +++ b/flight/Engine.php @@ -45,8 +45,6 @@ class Engine { $this->vars = array(); $this->loader = new Loader(); - $this->loader->autoload(true, dirname(dirname(__DIR__))); - $this->dispatcher = new Dispatcher(); $this->init(); @@ -79,6 +77,7 @@ class Engine { static $initialized = false; if ($initialized) { + $this->vars = array(); $this->loader->reset(); $this->dispatcher->reset(); } diff --git a/flight/Flight.php b/flight/Flight.php index 60407fa..5cbfff6 100644 --- a/flight/Flight.php +++ b/flight/Flight.php @@ -36,7 +36,6 @@ class Flight { require_once __DIR__.'/autoload.php'; self::$engine = new \flight\Engine(); - self::$engine->init(); $initialized = true; }