Changeset 4610 for extensions

Timestamp:

Jan 4, 2010, 12:10:11 AM (15 years ago)

Author:

ronosman

Message:

Bug 1362 fixed : cannot connect to Piwigo when hosted by free.fr

File:

• extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm (modified) (1 diff)

extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm

@@ -169 +169 @@
 
     if($self->uagent_response->is_success){
-        # when server response has warnings, the content response is not a valid json string
-                # find the json response
-        $self->uagent_response->content =~ /(\{.+\})/;
-                #printf("json response %s\n", $1);
         eval {
             $hresult = from_json(
-                $1
+                $self->uagent_response->content
             );
         };
-                
+                if($@){
+            # when server response has warnings, the content response is not a valid json string
+                    # find the json response
+            $self->uagent_response->content =~ /(\{.+\})/;
+                    #printf("json response %s\n", $1);
+            eval {
+                $hresult = from_json(
+                    $1
+                );
+            };
+        }               
     }
     else{