mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
Fix: FS#15526 non-UTF8 character in rpc output
Currently AUR does not check the uploaded packages, whether they are correctly in UTF8 encoding. If there are fields (such as $pkgdesc) that contain such non-UTF8 characters, the rpc interface chokes on those fields: even if there's data successfully retrieved from the database, rpc returns "null". In an effort to make such errors in the PKGBUILDs debugged more easily, let's force rpc to have more useful output: try to convert non-UTF8 fields to UTF8. If it's a success, good. Partial success (some characters showing as \uXXXX) is ok. Failure results in error message printed to that field. Signed-off-by: Gergely Imreh <imrehg@gmail.com> Signed-off-by: Loui Chang <louipc.ist@gmail.com>
This commit is contained in:
parent
1bf54a32c4
commit
4d1eb4dd7a
1 changed files with 9 additions and 0 deletions
|
@ -139,6 +139,15 @@ class AurJSON {
|
|||
if ( $result && (mysql_num_rows($result) > 0) ) {
|
||||
$row = mysql_fetch_assoc($result);
|
||||
mysql_free_result($result);
|
||||
foreach($row as $name => $value) {
|
||||
$converted = utf8_encode($value);
|
||||
if ($converted) {
|
||||
$row[$name] = $converted;
|
||||
}
|
||||
else {
|
||||
$row[$name] = "[PKGBUILD error: non-UTF8 character]";
|
||||
}
|
||||
}
|
||||
return $this->json_results('info', $row);
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Add table
Reference in a new issue