r104092 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r104091‎ | r104092 | r104093 >
Date:21:57, 23 November 2011
Author:khorn
Status:ok
Tags:
Comment:
MFT r104002, r104089
Modified paths:
  • /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/gateway.adapter.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/gateway.adapter.php
——@@ -283,7 +283,10 @@
284284 public function getFailPage() {
285285 $page = self::getGlobal( "FailPage" );
286286 if ( $page ) {
287 - $page = $this->appendLanguageAndMakeURL( $page );
 287+
 288+ $language = $this->getData_Raw( 'language' );
 289+
 290+ $page .= '?uselang=' . $language;
288291 }
289292 return $page;
290293 }
——@@ -1852,13 +1855,13 @@
18531856 if ( $this->getValidationAction() == 'challenge' ) {
18541857 // expose a hook for external handling of trxns flagged for challenge (eg captcha)
18551858 wfRunHooks( 'GatewayChallenge', array( &$this ) );
 1859+ }
18561860
1857 - // if the transaction was flagged for rejection
1858 - if ( $this->getValidationAction() == 'reject' ) {
1859 - // expose a hook for external handling of trxns flagged for rejection
1860 - wfRunHooks( 'GatewayReject', array( &$this ) );
1861 - $this->unsetAllSessionData();
1862 - }
 1861+ // if the transaction was flagged for rejection
 1862+ if ( $this->getValidationAction() == 'reject' ) {
 1863+ // expose a hook for external handling of trxns flagged for rejection
 1864+ wfRunHooks( 'GatewayReject', array( &$this ) );
 1865+ $this->unsetAllSessionData();
18631866 }
18641867 }
18651868
Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/gateway.adapter.php
___________________________________________________________________
Added: svn:mergeinfo
18661869 Merged /trunk/extensions/DonationInterface/gateway_common/gateway.adapter.php:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,99570-101026,101056,101060,101063-101064,101071-101074,101076,101099,101109,101112,101163,101180,101192,101200,101205,101207,101217,101230,101232,101236,101335,101382,101399,101441,101501-101504,101512,101541,101547,101549,101553-101555,101557,101559,101561,101563,101576,101578-101579,101631,101633,101638,101669,101676,101679,101689,101700,101706,101719,101740,101747,101757,101764,101778-101779,101781,101785-101789,101798,101823,101826,101837,101846,101852,101870-101872,101878,101882,101890,101892,101910,101917,101929,101947,101949-101951,101955-101960,101962,101964-101966,101996,102003,102011-102012,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102123-102127,102130,102134,102140,102147,102151-102152,102155-102156,102186,102188-102242,102252,102258-102261,102263,102267,102269,102307-102309,102313,102318,102332,102338,102341-102342,102345,102364,102419,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102681-102682,102685,102689,102698,102700-102703,102707,102711-102712,102714,102729,102733,102736,102740,102752,102763,102805,102807,102809-102810,102812,102819-102824,102826,102828-102833,102835-102836,102841,102872,102878,102915,102921-102923,102926-102928,102932,102936,102938,102942-102943,102946,102953,102960-102961,103009,103023-103024,103026-103027,103032,103036-103038,103040,103044,103050,103058,103067,103077,103080,103130,103219,103223,103229,103235,103237-103239,103243-103247,103253,103255,103259,103261-103262,103264,103275,103278,103284,103289-103291,103325,103371,103397,103399,103401,103411,103413,103421,103434-103435,103481,103500,103503,103515,103519,103537,103541,103548,103591,103607-103608,103633,103680,103775,103784,103837,103839,103863,103866,104002,104089
18671870 Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/gateway.adapter.php:r99568

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r104002Changed fail page to pass uselang.jpostlethwaite01:55, 23 November 2011
r104089Missing a curly brace, all the way back from r101785. This explains why the s...khorn21:29, 23 November 2011

Status & tagging log