diff options
| author | Wladimir J. van der Laan <[email protected]> | 2013-12-06 09:46:25 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2013-12-06 09:46:48 +0100 |
| commit | b4297c8fffa6a21535015db4e34b95041a386fbb (patch) | |
| tree | fa8fada71c94cd6200e18cf742df26679983492e /src | |
| parent | Merge pull request #3362 from Michagogo/signed-tags (diff) | |
| parent | Payment request URI syntax changed, from request=... to r=... (diff) | |
| download | discoin-b4297c8fffa6a21535015db4e34b95041a386fbb.tar.xz discoin-b4297c8fffa6a21535015db4e34b95041a386fbb.zip | |
Merge pull request #3353
1e01f7c Payment request URI syntax changed, from request=... to r=... (Gavin Andresen)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/openuridialog.cpp | 2 | ||||
| -rw-r--r-- | src/qt/paymentserver.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index 803a3c9dd..06189aeaf 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -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())); } diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 34da0f90e..d66a72207 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -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); |