Merge branch 'develop' into loic

2 files changed, 5 insertions, 5 deletions

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 1312083..84af889 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -84,7 +84,7 @@ class compute
          * Get image details.
          * @return array
          */
-        public function getImage(array $options = [])
+        public function getImage()
         {
 		$imageId = $this->app->getPostParam("imageId");
 		$opt = array('id' => $imageId);
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index b71defa..f239d84 100644
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -263,10 +263,10 @@ class genTokenOptions
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
-		loadComputeBackup($backup["Compute"]);
-		loadIdentityBackup($backup["Identity"]);
-		loadImageBackup($backup["Image"]);
-		loadNetworkBackup($backup["Network"]);
+		$this->loadComputeBackup($backup["Compute"]);
+		$this->loadIdentityBackup($backup["Identity"]);
+		$this->loadImageBackup($backup["Image"]);
+		$this->loadNetworkBackup($backup["Network"]);
 		
 	}