Merge branch 'develop' into loic

2 files changed, 3 insertions, 0 deletions

diff --git a/server/core/App.php b/server/core/App.php
index 282a1db..edb75f6 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -105,6 +105,7 @@ class App{
 	

 	public function show(){

 		echo json_encode($this->output);

+		//error_log(var_dump(json_encode($this->output), true), 0);

 	}

 	

 }

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index f239d84..50826ed 100644..100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -260,6 +260,7 @@ class genTokenOptions
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
+
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
@@ -324,6 +325,7 @@ class genTokenOptions
 	
 	private function unserializeToken($tokenSerialized){
 		$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
+		$Saved = unserialize($Saved);
 		$api = new Api();
 		$token = new Models\Token($this->httpClient, $api);
 		$token->methods = unserialize($tokenSerialized["methods"]);