### Eclipse Workspace Patch 1.0 #P drupal_test_6 Index: misc/progress.js =================================================================== RCS file: /cvs/drupal/drupal/misc/progress.js,v retrieving revision 1.19 diff -u -r1.19 progress.js --- misc/progress.js 21 Oct 2007 18:59:01 -0000 1.19 +++ misc/progress.js 27 Dec 2007 16:34:49 -0000 @@ -85,7 +85,18 @@ pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay); }, error: function (xmlhttp) { - pb.displayError(Drupal.t("An HTTP error @status occurred. \n@uri", { '@status': xmlhttp.status, '@uri': pb.uri })); + if (xmlhttp.status == 200) { + if (jQuery.trim($(xmlhttp.responseText).text())) { + var message = Drupal.t("An error occurred. \n@uri\n@text", {'@uri': pb.uri, '@text': xmlhttp.responseText }); + } + else { + var message = Drupal.t("An error occurred. \n@uri\n(no information available).", {'@uri': pb.uri }); + } + } + else { + var message = Drupal.t("An HTTP error @status occurred. \n@uri", {'@uri': pb.uri, '@status': xmlhttp.status }); + } + pb.displayError(message); } }); }