Merge pull request #388 from swooletw/develop

albertcht · web-flow · commit 2271aa7fbd88 · 2020-03-29T17:13:36.000+08:00
Clear context after disabling sandbox
diff --git a/src/Server/Sandbox.php b/src/Server/Sandbox.php
@@ -324,8 +324,8 @@ public function enable()
      */
     public function disable()
     {
-        Context::clear();
         $this->setInstance($this->getBaseApp());
+        Context::clear();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,8 @@ public function enable()`
`324`	`324`	`*/`
`325`	`325`	`public function disable()`
`326`	`326`	`{`
`327`		`- Context::clear();`
`328`	`327`	`$this->setInstance($this->getBaseApp());`
	`328`	`+ Context::clear();`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`/**`