From 11dc33c440f97410a2358f7e615d2adc5e69f072 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Tue, 15 Mar 2016 23:45:19 +0100 Subject: Error / Conflict Correction --- server/core/Image.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) mode change 100644 => 100755 server/core/Image.php (limited to 'server/core/Image.php') diff --git a/server/core/Image.php b/server/core/Image.php old mode 100644 new mode 100755 index f2af5cc..d37c828 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -70,12 +70,7 @@ class image implements Core{ * options for the image creation * **/ -<<<<<<< HEAD - private function createImage(array $opt){ - -======= private function createImage(){ ->>>>>>> develop $opt = $this->app->getPostParam("opt"); @@ -408,15 +403,9 @@ class image implements Core{ * @param string $id * identifier of the image **/ -<<<<<<< HEAD - private function downloadImage($id){ -<<<<<<< HEAD -======= -======= private function downloadImage(){ ->>>>>>> develop $id = $this->app->getPostParam("id"); ->>>>>>> develop + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } -- cgit v1.2.3