r75663 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r75662‎ | r75663 | r75664 >
Date:18:55, 29 October 2010
Author:awjrichards
Status:deferred
Tags:
Comment:
Revert r75661
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php
@@ -135,20 +135,20 @@
136136 // Populate form data
137137 $data = $this->fnGetFormData( $amount, $numAttempt, $token, $payflow_data['order_id'] );
138138
 139+ /**
 140+ * handle PayPal redirection
 141+ *
 142+ * if paypal redirection is enabled ($wgPayflowGatewayPaypalURL must be defined)
 143+ * and the PaypalRedirect form value must be true
 144+ */
 145+ if ( $wgRequest->getBool( 'PaypalRedirect' )) {
 146+ $this->paypalRedirect( $data );
 147+ return;
 148+ }
 149+
139150 // dispatch forms/handling
140151 if( $token_match ) {
141 -
142 - /**
143 - * handle PayPal redirection
144 - *
145 - * if paypal redirection is enabled ($wgPayflowGatewayPaypalURL must be defined)
146 - * and the PaypalRedirect form value must be true
147 - */
148 - if ( $wgRequest->getBool( 'PaypalRedirect' )) {
149 - $this->paypalRedirect( $data );
150 - return;
151 - }
152 -
 152+
153153 if( $data['payment_method'] == 'processed' ) {
154154 //increase the count of attempts
155155 ++$data['numAttempt'];

Follow-up revisions

RevisionCommit summaryAuthorDate
r75664Merging from r75657 to r75663 of trunkawjrichards19:00, 29 October 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75661Put paypal redirect call after token check due to unexpected behavior of movi...awjrichards18:45, 29 October 2010

Status & tagging log