From e8c5762e22f51fcd8a41aadf6a7b757e65814c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=BChr?= <luehr@r-pentomino.de>
Date: Mon, 18 Jun 2012 15:52:44 +0300
Subject: [PATCH] Method signature getFromWebserviceImport() did not match
 parent::getFromWebserviceImport() - corrected. This fixed an error related to
 http://www.pimcore.org/issues/browse/PIMCORE-1428

---
 pimcore/models/Object/Class/Data/Image.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pimcore/models/Object/Class/Data/Image.php b/pimcore/models/Object/Class/Data/Image.php
index 969affee394..5b78cd0c849 100644
--- a/pimcore/models/Object/Class/Data/Image.php
+++ b/pimcore/models/Object/Class/Data/Image.php
@@ -252,9 +252,10 @@ public function getForWebserviceExport ($object) {
     /**
      * converts data to be imported via webservices
      * @param mixed $value
+     * @param mixed $object
      * @return mixed
      */
-    public function getFromWebserviceImport($value) {
+    public function getFromWebserviceImport($value, $object = null) {
         
         $asset = Asset::getById($value);
         if(empty($value)){