dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bitcoin/bitcoin

Browse Source 
Conflicts:
	src/script.cpp
This commit is contained in:
Wladimir J. van der Laan
2011-07-27 21:44:55 +02:00
parent 7df001be94 a139ed74f2
commit b5b1d1a66b
6 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/transactiondesc.cpp
View File

@@ -211,7 +211,7 @@ string TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
{
// Offline transaction
CBitcoinAddress address;
if (ExtractAddress(txout.scriptPubKey, wallet, address))
if (ExtractAddress(txout.scriptPubKey, 0, address))
{
strHTML += _("<b>To:</b> ");
if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].empty())