| Index: branches/wmf-deployment/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php |
| — | — | @@ -175,7 +175,7 @@ |
| 176 | 176 | require_once( 'includes/stateAbbreviations.inc' ); |
| 177 | 177 | require_once( 'includes/countryCodes.inc' ); |
| 178 | 178 | |
| 179 | | - global $wgOut, $wgLang; |
| | 179 | + global $wgOut, $wgLang, $wgWikipediaForeverTheme; |
| 180 | 180 | |
| 181 | 181 | // save contrib tracking id early to track abondonment |
| 182 | 182 | if ( $data[ 'numAttempt' ] == 0 ) { |
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | // intro text |
| 263 | | - if ( $wgWikipediForeverTheme ) { |
| | 263 | + if ( $wgWikipediaForeverTheme ) { |
| 264 | 264 | $wgOut->addWikiText( '{{2009/Donate-header/' . $data[language] . '}}' ); |
| 265 | 265 | } |
| 266 | 266 | |
| — | — | @@ -766,7 +766,7 @@ |
| 767 | 767 | function fnPayflowDisplayApprovedResults( $data, $responseArray, $responseMsg ) { |
| 768 | 768 | require_once( 'includes/countryCodes.inc' ); |
| 769 | 769 | |
| 770 | | - global $wgOut, $wgThankYouPage; |
| | 770 | + global $wgOut, $wgExternalThankYouPage; |
| 771 | 771 | $transaction = ''; |
| 772 | 772 | $tracked = ''; |
| 773 | 773 | |
| — | — | @@ -784,8 +784,8 @@ |
| 785 | 785 | // hook to call stomp functions |
| 786 | 786 | wfRunHooks( 'gwStomp', array( &$transaction ) ); |
| 787 | 787 | |
| 788 | | - if ( $wgExternalThankYou ) { |
| 789 | | - $wgOut->redirect( $wgThankYouPage . $data[language] ); |
| | 788 | + if ( $wgExternalThankYouPage ) { |
| | 789 | + $wgOut->redirect( $wgExternalThankYouPage . "/" . $data[language] ); |
| 790 | 790 | } else { |
| 791 | 791 | // display response message |
| 792 | 792 | $wgOut->addHTML( '<h3 class="response_message">' . $responseMsg . '</h3>' ); |
| Property changes on: branches/wmf-deployment/extensions/DonationInterface/payflowpro_gateway |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 793 | 793 | - /branches/REL1_15/phase3/extensions/DonationInterface/payflowpro_gateway:51646 |
| /trunk/extensions/DonationInterface/payflowpro_gateway:56207,56209,56296,56333,56355,58523-59861,60048-60050 |
| /trunk/phase3/extensions/DonationInterface/payflowpro_gateway:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 794 | 794 | + /branches/REL1_15/phase3/extensions/DonationInterface/payflowpro_gateway:51646 |
| /trunk/extensions/DonationInterface/payflowpro_gateway:56207,56209,56296,56333,56355,58523-59861,60048-60050,60069-60070 |
| /trunk/phase3/extensions/DonationInterface/payflowpro_gateway:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |