diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-11-01 21:38:56 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-11-01 21:38:56 +0000 |
| commit | 63beb458c0c136e80c9fd8a16a81f710a41258c8 (patch) | |
| tree | 891a6a94e0e15ddfb5d0a2168e9ce4383c196301 /misc/drupal.js | |
| parent | c2a4b9c19fa58274f475dadf8aaaa36fe493e594 (diff) | |
| download | brdo-63beb458c0c136e80c9fd8a16a81f710a41258c8.tar.gz brdo-63beb458c0c136e80c9fd8a16a81f710a41258c8.tar.bz2 | |
- Patch #313902 by c960657: properly display SimpleTest errors.
Diffstat (limited to 'misc/drupal.js')
| -rw-r--r-- | misc/drupal.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/drupal.js b/misc/drupal.js index 157a20fea..bc76189cf 100644 --- a/misc/drupal.js +++ b/misc/drupal.js @@ -286,17 +286,17 @@ Drupal.getSelection = function (element) { */ Drupal.ahahError = function(xmlhttp, uri) { if (xmlhttp.status == 200) { - if (jQuery.trim($(xmlhttp.responseText).text())) { + if (jQuery.trim(xmlhttp.responseText)) { var message = Drupal.t("An error occurred. \n@uri\n@text", {'@uri': uri, '@text': xmlhttp.responseText }); } else { - var message = Drupal.t("An error occurred. \n@uri\n(no information available).", {'@uri': uri, '@text': xmlhttp.responseText }); + var message = Drupal.t("An error occurred. \n@uri\n(no information available).", {'@uri': uri }); } } else { var message = Drupal.t("An HTTP error @status occurred. \n@uri", {'@uri': uri, '@status': xmlhttp.status }); } - return message; + return message.replace(/\n/g, '<br />');; } // Global Killswitch on the <html> element. |