Merge pull request #3964 from annando/uexport-json
Avoid empty user export when there are UTF8 problems
This commit is contained in:
commit
0d7b3b4007
|
@ -126,7 +126,7 @@ function uexport_account($a) {
|
|||
);
|
||||
|
||||
//echo "<pre>"; var_dump(json_encode($output)); killme();
|
||||
echo json_encode($output);
|
||||
echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -154,6 +154,6 @@ function uexport_all(App $a) {
|
|||
);
|
||||
|
||||
$output = array('item' => $r);
|
||||
echo json_encode($output) . "\n";
|
||||
echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR). "\n";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue