| Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.body.php |
| — | — | @@ -133,7 +133,7 @@ |
| 134 | 134 | $thankyoupage = $this->adapter->getGlobal( 'ThankYouPage' ); |
| 135 | 135 | |
| 136 | 136 | if ( $thankyoupage ) { |
| 137 | | - $wgOut->redirect( $thankyoupage . "/" . $data['language'] ); |
| | 137 | + $wgOut->redirect( $thankyoupage ); |
| 138 | 138 | } else { |
| 139 | 139 | // display response message |
| 140 | 140 | $wgOut->addHTML( '<h3 class="response_message">' . $responseMsg . '</h3>' ); |
| — | — | @@ -161,10 +161,10 @@ |
| 162 | 162 | */ |
| 163 | 163 | function fnPayflowDisplayDeclinedResults( $responseMsg ) { |
| 164 | 164 | global $wgOut; |
| 165 | | - $failpage = $this->adapter->getGlobal( 'FailPage' ); |
| | 165 | + $failpage = $this->adapter->getFailPage(); |
| 166 | 166 | |
| 167 | 167 | if ( $failpage ) { |
| 168 | | - $wgOut->redirect( $failpage . "/" . $data['language'] ); |
| | 168 | + $wgOut->redirect( $failpage ); |
| 169 | 169 | } else { |
| 170 | 170 | // general decline message |
| 171 | 171 | $declinedDefault = wfMsg( 'php-response-declined' ); |
| Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php |
| — | — | @@ -268,7 +268,7 @@ |
| 269 | 269 | |
| 270 | 270 | $queryString = '?payment_method=' . $this->adapter->getPaymentMethod() . '&payment_submethod=' . $this->adapter->getPaymentSubmethod(); |
| 271 | 271 | |
| 272 | | - $url = $this->adapter->getGlobal( 'ThankYouPage' ) . '/' . $this->adapter->getTransactionDataLanguage() . $queryString; |
| | 272 | + $url = $this->adapter->getThankYouPage() . $queryString; |
| 273 | 273 | |
| 274 | 274 | $link = Xml::tags( 'a', array( 'href' => $url ), wfMsg( 'donate_interface-bt-finished' ) ); |
| 275 | 275 | |
| Index: trunk/extensions/DonationInterface/gateway_common/gateway.adapter.php |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | * @global type $wgLang |
| 254 | 254 | * @return mixed Page URL in string format, or false if none is set. |
| 255 | 255 | */ |
| 256 | | - function getThankYouPage() { |
| | 256 | + public function getThankYouPage() { |
| 257 | 257 | $page = self::getGlobal( "ThankYouPage" ); |
| 258 | 258 | if ( $page ) { |
| 259 | 259 | $page = $this->appendLanguageAndMakeURL( $page ); |
| — | — | @@ -265,7 +265,7 @@ |
| 266 | 266 | * @global type $wgLang |
| 267 | 267 | * @return mixed Page URL in string format, or false if none is set. |
| 268 | 268 | */ |
| 269 | | - function getFailPage() { |
| | 269 | + public function getFailPage() { |
| 270 | 270 | $page = self::getGlobal( "FailPage" ); |
| 271 | 271 | if ( $page ) { |
| 272 | 272 | $page = $this->appendLanguageAndMakeURL( $page ); |
| — | — | @@ -281,7 +281,7 @@ |
| 282 | 282 | * page title. |
| 283 | 283 | * @return string A URL |
| 284 | 284 | */ |
| 285 | | - function appendLanguageAndMakeURL( $url ){ |
| | 285 | + protected function appendLanguageAndMakeURL( $url ){ |
| 286 | 286 | $language = $this->getData_Raw( 'language' ); |
| 287 | 287 | //make sure we don't already have the language in there... |
| 288 | 288 | $dirs = explode('/', $url); |
| — | — | @@ -334,7 +334,7 @@ |
| 335 | 335 | * @return mixed All the staged data held by the adapter, or if a key was |
| 336 | 336 | * set, the staged value for that key. |
| 337 | 337 | */ |
| 338 | | - function getData_Staged( $val = '' ) { |
| | 338 | + protected function getData_Staged( $val = '' ) { |
| 339 | 339 | if ( $val === '' ) { |
| 340 | 340 | return $this->staged_data; |
| 341 | 341 | } else { |
| — | — | @@ -1701,19 +1701,6 @@ |
| 1702 | 1702 | } |
| 1703 | 1703 | |
| 1704 | 1704 | /** |
| 1705 | | - * Returns false if language does not exist or string if it does exist |
| 1706 | | - * |
| 1707 | | - * @todo |
| 1708 | | - * - Can we just get the language from somewhere else to make this simpler? |
| 1709 | | - * |
| 1710 | | - * @return false|string |
| 1711 | | - */ |
| 1712 | | - public function getTransactionDataLanguage() { |
| 1713 | | - |
| 1714 | | - return $this->getData_Raw( 'language' ); |
| 1715 | | - } |
| 1716 | | - |
| 1717 | | - /** |
| 1718 | 1705 | * Returns an array of errors. This should be an empty array on success. |
| 1719 | 1706 | * |
| 1720 | 1707 | * @return array |
| Index: trunk/extensions/DonationInterface/gateway_common/GatewayForm.php |
| — | — | @@ -545,13 +545,13 @@ |
| 546 | 546 | |
| 547 | 547 | if ( in_array( $this->adapter->getTransactionWMFStatus(), $this->adapter->getGoToThankYouOn() ) ) { |
| 548 | 548 | |
| 549 | | - $thankyoupage = $this->adapter->getGlobal( 'ThankYouPage' ); |
| | 549 | + $thankyoupage = $this->adapter->getThankYouPage(); |
| 550 | 550 | |
| 551 | 551 | if ( $thankyoupage ) { |
| 552 | 552 | |
| 553 | 553 | $queryString = '?payment_method=' . $this->adapter->getPaymentMethod() . '&payment_submethod=' . $this->adapter->getPaymentSubmethod(); |
| 554 | 554 | |
| 555 | | - return $wgOut->redirect( $thankyoupage . '/' . $this->adapter->getTransactionDataLanguage() . $queryString ); |
| | 555 | + return $wgOut->redirect( $thankyoupage . $queryString ); |
| 556 | 556 | } |
| 557 | 557 | } |
| 558 | 558 | |