From 6c1be047c320699fd432d8b81f559580f336b8c3 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 19 Sep 2012 14:11:24 +0000 Subject: [PATCH] // Fix PSCFV-4060 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17419 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/webservice/WebserviceRequest.php | 4 ++-- classes/webservice/WebserviceSpecificManagementImages.php | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php index e6444fde6..0f0704055 100644 --- a/classes/webservice/WebserviceRequest.php +++ b/classes/webservice/WebserviceRequest.php @@ -1476,16 +1476,16 @@ class WebserviceRequestCore } elseif ((!isset($fieldProperties['required']) || !$fieldProperties['required']) && property_exists($object, $sqlId)) $object->$sqlId = null; - if (isset($fieldProperties['i18n']) && $fieldProperties['i18n']) { $i18n = true; if (isset($attributes->$fieldName, $attributes->$fieldName->language)) foreach ($attributes->$fieldName->language as $lang) $object->{$fieldName}[(int)$lang->attributes()->id] = (string)$lang; + else + $object->{$fieldName} = (string)$attributes->$fieldName; } } - if (!$this->hasErrors()) { if ($i18n && ($retValidateFieldsLang = $object->validateFieldsLang(false, true)) !== true) diff --git a/classes/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php index c82fd93ad..8018d767f 100755 --- a/classes/webservice/WebserviceSpecificManagementImages.php +++ b/classes/webservice/WebserviceSpecificManagementImages.php @@ -976,6 +976,10 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage } @unlink($tmpName); $this->imgToDisplay = _PS_PROD_IMG_DIR_.$image->getExistingImgPath().'.'.$image->image_format; + $this->objOutput->setFieldsToDisplay('full'); + $this->output = $this->objOutput->renderEntity($image, 1); + $image_content = array('sqlId' => 'content', 'value' => file_get_contents($this->imgToDisplay)); + $this->output .= $this->objOutput->objectRender->renderField($image_content); } elseif ($this->imageType == 'categories') {