Merge pull request #3353
1e01f7c
Payment request URI syntax changed, from request=... to r=... (Gavin Andresen)
This commit is contained in:
commit
b4297c8fff
2 changed files with 3 additions and 3 deletions
|
@ -48,5 +48,5 @@ void OpenURIDialog::on_selectFileButton_clicked()
|
|||
if(filename.isEmpty())
|
||||
return;
|
||||
QUrl fileUri = QUrl::fromLocalFile(filename);
|
||||
ui->uriEdit->setText("bitcoin:?request=" + QUrl::toPercentEncoding(fileUri.toString()));
|
||||
ui->uriEdit->setText("bitcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
|
||||
}
|
||||
|
|
|
@ -366,10 +366,10 @@ void PaymentServer::handleURIOrFile(const QString& s)
|
|||
#else
|
||||
QUrlQuery uri((QUrl(s)));
|
||||
#endif
|
||||
if (uri.hasQueryItem("request"))
|
||||
if (uri.hasQueryItem("r"))
|
||||
{
|
||||
QByteArray temp;
|
||||
temp.append(uri.queryItemValue("request"));
|
||||
temp.append(uri.queryItemValue("r"));
|
||||
QString decoded = QUrl::fromPercentEncoding(temp);
|
||||
QUrl fetchUrl(decoded, QUrl::StrictMode);
|
||||
|
||||
|
|
Loading…
Reference in a new issue