diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-29 08:30:37 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-29 08:30:37 +0100 |
| commit | 88894499be544d50c9217b950a1ac801489c2442 (patch) | |
| tree | 8915bfb5af37178d3e4f30dc58ac74247c263318 /server/core/LibOverride/genTokenOptions.php | |
| parent | 791045bc0526edb92d89633ed6030d43998d7a3e (diff) | |
| parent | 0ab3116656c41300c571832b4f543125f93da399 (diff) | |
Merge branch 'develop' into loic
Diffstat (limited to 'server/core/LibOverride/genTokenOptions.php')
| -rwxr-xr-x[-rw-r--r--] | server/core/LibOverride/genTokenOptions.php | 2 |
1 files changed, 2 insertions, 0 deletions
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"]); |
