From b532bbca51b5a20e6f6c7cd6283d8b3d83e77dc4 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 17 Jun 2013 16:42:17 +0200 Subject: [PATCH] Do not mark PPS transactions as unconfirmed Fixes #206 --- public/include/classes/transaction.class.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php index a6acd15c..38e1b429 100644 --- a/public/include/classes/transaction.class.php +++ b/public/include/classes/transaction.class.php @@ -203,10 +203,7 @@ class Transaction { FROM $this->table AS t LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id WHERE - ( - ( t.type IN ('Credit','Bonus') AND b.confirmations < ? ) OR - ( t.type = 'Credit_PPS' ) - ) + t.type IN ('Credit','Bonus') AND b.confirmations < ? AND t.account_id = ? ) AS t4, ( @@ -215,8 +212,7 @@ class Transaction { LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id WHERE ( - ( t.type IN ('Donation','Fee') AND b.confirmations < ? ) OR - ( t.type IN ('Donation_PPS', 'Fee_PPS', 'TXFee') ) + t.type IN ('Donation','Fee') AND b.confirmations < ? ) AND t.account_id = ? ) AS t5