r100486 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r100485‎ | r100486 | r100487 >
Date:02:01, 22 October 2011
Author:khorn
Status:ok (Comments)
Tags:
Comment:
Reverting r100476, due to the part where MWInit doesn't exist in 1.17, and we need DI to work on 1.17.
Modified paths:
  • /trunk/extensions/DonationInterface/gateway_common/DonationData.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_common/GatewayForm.php (modified) (history)
  • /trunk/extensions/DonationInterface/gateway_common/gateway.adapter.php (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php (modified) (history)
  • /trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_resultswitcher.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_resultswitcher.body.php
@@ -46,7 +46,7 @@
4747 //and then pop out. Maybe. We're probably going to have to test it a couple different ways, for user experience.
4848 //However, we're _definitely_ going to need to pop out _before_ we redirect to the thank you or fail pages.
4949 if ( strpos( $referrer, $wgServer ) === false ) {
50 - $wgOut->allowClickjacking(); // so we can embed in an iframe when necessary
 50+ $wgOut->allowClickjacking();
5151 $wgOut->addModules( 'iframe.liberator' );
5252 return;
5353 }
Index: trunk/extensions/DonationInterface/globalcollect_gateway/globalcollect_gateway.body.php
@@ -44,7 +44,7 @@
4545 global $wgRequest, $wgOut, $wgExtensionAssetsPath;
4646 $CSSVersion = $this->adapter->getGlobal( 'CSSVersion' );
4747
48 - $wgOut->allowClickjacking(); // so we can embed in an iframe when necessary
 48+ $wgOut->allowClickjacking();
4949
5050 $wgOut->addExtensionStyle(
5151 $wgExtensionAssetsPath . '/DonationInterface/gateway_forms/css/gateway.css?284' .
Index: trunk/extensions/DonationInterface/gateway_common/gateway.adapter.php
@@ -1103,10 +1103,9 @@
11041104 // refresh our data
11051105 $this->postdata = $this->dataObj->getData();
11061106
1107 - // update contribution tracking
 1107+ //update contribution tracking
11081108 $this->dataObj->updateContributionTracking( true );
11091109
1110 - // Build the redirect URL. $this->postdata['language'] is escaped by sanitizeInput().
11111110 $ret = self::getGlobal( "PaypalURL" ) . "/" . $this->postdata['language'] . "?gateway=paypal&" . http_build_query( $this->getPaypalData() );
11121111 self::log( $ret );
11131112 return $ret;
@@ -1256,7 +1255,7 @@
12571256 }
12581257
12591258 public function getFormClass() {
1260 - if ( isset( $this->form_class ) && MWInit::classExists( $this->form_class ) ) {
 1259+ if ( isset( $this->form_class ) && class_exists( $this->form_class ) ) {
12611260 return $this->form_class;
12621261 } else {
12631262 return false;
Index: trunk/extensions/DonationInterface/gateway_common/DonationData.php
@@ -711,7 +711,7 @@
712712 }
713713
714714 function getAdapterClass(){
715 - if ( MWInit::classExists( $this->boss ) ) {
 715+ if ( class_exists( $this->boss ) ) {
716716 return $this->boss;
717717 } else {
718718 return false;
Index: trunk/extensions/DonationInterface/gateway_common/GatewayForm.php
@@ -334,10 +334,10 @@
335335
336336 // make sure our form class exists before going on, if not try loading default form class
337337 $class_name = "Gateway_Form_" . $form_class;
338 - if ( !MWInit::classExists( $class_name ) ) {
 338+ if ( !class_exists( $class_name ) ) {
339339 $class_name_orig = $class_name;
340340 $class_name = "Gateway_Form_" . $defaultForm;
341 - if ( !MWInit::classExists( $class_name ) ) {
 341+ if ( !class_exists( $class_name ) ) {
342342 throw new MWException( 'Could not load form ' . $class_name_orig . ' nor default form ' . $class_name );
343343 }
344344 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r100476follow-up to r98202 - some comments and fixeskaldari23:51, 21 October 2011

Comments

#Comment by Kaldari (talk | contribs)   02:22, 22 October 2011

Oops, I didn't realize MWInit was that new.

Status & tagging log