Merge pull request #3353

1e01f7c Payment request URI syntax changed, from request=... to r=... (Gavin Andresen)
This commit is contained in:
Wladimir J. van der Laan 2013-12-06 09:46:25 +01:00
commit b4297c8fff
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 3 additions and 3 deletions

View file

@ -48,5 +48,5 @@ void OpenURIDialog::on_selectFileButton_clicked()
if(filename.isEmpty()) if(filename.isEmpty())
return; return;
QUrl fileUri = QUrl::fromLocalFile(filename); QUrl fileUri = QUrl::fromLocalFile(filename);
ui->uriEdit->setText("bitcoin:?request=" + QUrl::toPercentEncoding(fileUri.toString())); ui->uriEdit->setText("bitcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
} }

View file

@ -366,10 +366,10 @@ void PaymentServer::handleURIOrFile(const QString& s)
#else #else
QUrlQuery uri((QUrl(s))); QUrlQuery uri((QUrl(s)));
#endif #endif
if (uri.hasQueryItem("request")) if (uri.hasQueryItem("r"))
{ {
QByteArray temp; QByteArray temp;
temp.append(uri.queryItemValue("request")); temp.append(uri.queryItemValue("r"));
QString decoded = QUrl::fromPercentEncoding(temp); QString decoded = QUrl::fromPercentEncoding(temp);
QUrl fetchUrl(decoded, QUrl::StrictMode); QUrl fetchUrl(decoded, QUrl::StrictMode);