Merge pull request #465

jmikola · jmikola · commit df0ff2bfa5d6 · 2016-11-22T11:06:43.000-05:00
diff --git a/src/bson.c b/src/bson.c
@@ -1679,7 +1679,7 @@ PHP_FUNCTION(fromJSON)
 		PHONGO_RETVAL_STRINGL((const char *) bson_get_data(&b), b.len);
 		bson_destroy(&b);
 	} else {
-		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.message ? error.message : "Error parsing JSON");
+		phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.domain == BSON_ERROR_JSON ? error.message : "Error parsing JSON");
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1679,7 +1679,7 @@ PHP_FUNCTION(fromJSON)`
`1679`	`1679`	`PHONGO_RETVAL_STRINGL((const char *) bson_get_data(&b), b.len);`
`1680`	`1680`	`bson_destroy(&b);`
`1681`	`1681`	`} else {`
`1682`		`- phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.message ? error.message : "Error parsing JSON");`
	`1682`	`+ phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.domain == BSON_ERROR_JSON ? error.message : "Error parsing JSON");`
`1683`	`1683`	`}`
`1684`	`1684`	`}`
`1685`	`1685`	`/* }}} */`