[GNUnet-SVN] [taler-merchant] branch master updated (f66c0f3 -> 806ec0f)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository merchant.

    from f66c0f3  set instance on merchant
     add 806ec0f  remove instance from order after looking up merchant info

No new revisions were added by this update.

Summary of changes:
 src/backend/taler-merchant-httpd_proposal.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/backend/taler-merchant-httpd_proposal.c 
b/src/backend/taler-merchant-httpd_proposal.c
index 53bf834..be4359b 100644
--- a/src/backend/taler-merchant-httpd_proposal.c
+++ b/src/backend/taler-merchant-httpd_proposal.c
@@ -477,6 +477,11 @@ proposal_put (struct MHD_Connection *connection,
        "Inconsistent instance given");
   }
 
+  /* Setting the instance on the order directly is just a shortcut,
+     the wallet shouldn't see that. */
+  json_object_del (order, "instance");
+  instance = NULL;
+
   /* add fields to the contract that the backend should provide */
   json_object_set (order,
                    "exchanges",

-- 
To stop receiving notification emails like this one, please contact
address@hidden