diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 4979ad2c9..9cd1b2ce2 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1009,7 +1009,6 @@ class adminProxy extends HttpProxyController public function uploadImage() { //!dataSystem - G::LoadSystem('inputfilter'); $filter = new InputFilter(); $_SERVER["REQUEST_URI"] = $filter->xssFilterHard($_SERVER["REQUEST_URI"]); @@ -1090,7 +1089,13 @@ class adminProxy extends HttpProxyController $uploaded = $filter->validateInput($uploaded,'int'); $files_img_type = $filter->xssFilterHard($files_img_type); $failed = $filter->validateInput($failed,'int'); - echo '{success: true, failed: ' . $failed . ', uploaded: ' . $uploaded . ', type: "' . $files_img_type . '"}'; + $resp = array( + 'success' => true, + 'failed' => $failed, + 'uploaded' => $uploaded, + 'type' => $files_img_type + ); + echo json_encode($resp); exit(); } diff --git a/workflow/engine/templates/admin/pmLogo.js b/workflow/engine/templates/admin/pmLogo.js index 0da25c7c1..fe349cec2 100644 --- a/workflow/engine/templates/admin/pmLogo.js +++ b/workflow/engine/templates/admin/pmLogo.js @@ -257,7 +257,7 @@ Ext.onReady(function() { waitTitle : " ", success : function(form, o) { obj = Ext.util.JSON.decode(o.response.responseText); - if (obj.failed == '0' && obj.uploaded != '0') { + if ((obj.failed == '' || obj.failed == '0') && obj.uploaded != '0') { PMExt.notify(_('ID_SUCCESS'), _('ID_YOUR_IMAGE_HAS_BEEN_SUCCESSFULLY')); } else {