Part of the fix for #1933 - give back a different error code in the case of a duplicate file.
This commit is contained in:
parent
0b1e16c92e
commit
814744d87e
|
@ -95,11 +95,18 @@ class XR_Archive extends Archive {
|
||||||
return $r;
|
return $r;
|
||||||
}
|
}
|
||||||
$res = $this->uploadClose($r['token'], $r['trtype'], $r['pars']);
|
$res = $this->uploadClose($r['token'], $r['trtype'], $r['pars']);
|
||||||
if (PEAR::isError($res))
|
if (PEAR::isError($res)) {
|
||||||
return new XML_RPC_Response(0, 803,
|
$code = 803;
|
||||||
|
// Special case for duplicate file - give back
|
||||||
|
// different error code so we can display nice user message.
|
||||||
|
if ($res->getCode() == GBERR_GUNID) {
|
||||||
|
$code = 888;
|
||||||
|
}
|
||||||
|
return new XML_RPC_Response(0, $code,
|
||||||
"xr_uploadClose: ".$res->getMessage().
|
"xr_uploadClose: ".$res->getMessage().
|
||||||
" ".$res->getUserInfo()
|
" ".$res->getUserInfo()
|
||||||
);
|
);
|
||||||
|
}
|
||||||
return new XML_RPC_Response(XML_RPC_encode($res));
|
return new XML_RPC_Response(XML_RPC_encode($res));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue