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

Conflicts: src/script.cpp
2011-07-27 21:44:55 +02:00
parent 7df001be94 a139ed74f2
commit b5b1d1a66b
6 changed files with 28 additions and 21 deletions
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -138,7 +138,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
                        // Sent to Bitcoin Address
                        sub.type = TransactionRecord::SendToAddress;
                        CBitcoinAddress address;
-                        if (ExtractAddress(txout.scriptPubKey, wallet, address))
+                        if (ExtractAddress(txout.scriptPubKey, 0, address))
                        {
                            sub.address = address.ToString();
                        }