summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2006-06-07 09:34:11 (GMT)
committerDries Buytaert2006-06-07 09:34:11 (GMT)
commit7bacdb435369334dd78a6dae5498338fa90f96ac (patch)
tree34fa0bd46b9dc673a24fd9c3505fccd648007705
parentb0ba5ef4f5f3fe39a12c85ca8111071d88daff43 (diff)
- Patch #59038 by nedjo: drupal.js parseJson() should allow valid [ first character
-rw-r--r--misc/drupal.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/drupal.js b/misc/drupal.js
index 6bbe8fc..539338e 100644
--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -316,7 +316,7 @@ function stopEvent(event) {
* The result is either the JSON object, or an object with 'status' 0 and 'data' an error message.
*/
function parseJson(data) {
- if (data.substring(0,1) != '{') {
+ if ((data.substring(0, 1) != '{') && (data.substring(0, 1) != '[')) {
return { status: 0, data: data.length ? data : 'Unspecified error' };
}
return eval('(' + data + ');');