Merge fixes.

This commit is contained in:
JoelKatz
2013-04-16 12:01:25 -07:00
parent 71c15310d9
commit 531dad6cfc
5 changed files with 4 additions and 5 deletions

View File

@@ -295,10 +295,9 @@ bool Transaction::convertToTransactions(uint32 firstLedgerSeq, uint32 secondLedg
// options 1 to include the date of the transaction
Json::Value Transaction::getJson(int options, bool binary) const
{
Json::Value ret(mTransaction->getJson(0, binary));
if (mInLedger)
if (mInLedger)
{
ret["inLedger"] = mInLedger;