| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_resultswitcher.body.php |
| — | — | @@ -62,9 +62,10 @@ |
| 63 | 63 | if ( $this->adapter->checkTokens() ) { |
| 64 | 64 | // Display form for the first time |
| 65 | 65 | $oid = $wgRequest->getText( 'order_id' ); |
| 66 | | - $adapter_oid = $this->adapter->getData_Raw(); |
| 67 | | - $adapter_oid = $adapter_oid['order_id']; |
| 68 | | - if ( $oid && !empty( $oid ) && $oid === $adapter_oid ) { |
| | 66 | + $adapter_oid = $this->adapter->getData_Raw( 'order_id' ); |
| | 67 | + |
| | 68 | + //this next block is for credit card coming back from GC. Only that. Nothing else, ever. |
| | 69 | + if ( $this->adapter->getData_Raw( 'payment_method') === 'cc' && $oid && !empty( $oid ) && $oid === $adapter_oid ) { |
| 69 | 70 | if ( !array_key_exists( 'order_status', $_SESSION ) || !array_key_exists( $oid, $_SESSION['order_status'] ) ) { |
| 70 | 71 | $_SESSION['order_status'][$oid] = $this->adapter->do_transaction( 'Confirm_CreditCard' ); |
| 71 | 72 | $_SESSION['order_status'][$oid]['data']['count'] = 0; |