highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-05 10:12:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3353

Browse Source 
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
parent d6d12f932d 1e01f7c506
commit b4297c8fff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/openuridialog.cpp
View File

@@ -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()));
}

4
src/qt/paymentserver.cpp
View File

@@ -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);