tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #3964 from annando/uexport-json

Browse source 
Avoid empty user export when there are UTF8 problems
This commit is contained in:
Tobias Diekershoff 2017-11-26 15:01:06 +01:00 committed by GitHub
commit 0d7b3b4007
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/uexport.php
View file

@ -126,7 +126,7 @@ function uexport_account($a) {
); );
//echo "<pre>"; var_dump(json_encode($output)); killme(); //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); $output = array('item' => $r);
echo json_encode($output) . "\n"; echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR). "\n";
} }
} }