r79304 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79303‎ | r79304 | r79305 >
Date:23:30, 30 December 2010
Author:tomasz
Status:deferred
Tags:
Comment:
Merge up to head of trunk from r79300. Picking up graphics fix
Modified paths:
  • /branches/fundraising/deployment/DonationInterface (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php (modified) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg (deleted) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png (added) (history)
  • /branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php (modified) (history)

Diff [purge]

Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/forms/TwoStepTwoColumnPremium.php
@@ -23,7 +23,7 @@
2424
2525 $form .= Xml::openElement( 'div', array( 'id' => 'premium-confirmation' ) );
2626 $form .= Xml::tags( 'div', array( 'id' => 'premium-header' ), wfMsg( 'payflowpro_gateway-tshirt-confirmation' ) );
27 - $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg", 'width' => '300', 'height' => '300' ) ) . "<br/>";
 27+ $form .= Xml::element( 'img', array( 'src' => $wgScriptPath . "/extensions/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png", 'width' => '300', 'height' => '280' ) ) . "<br/>";
2828 $form .= Xml::openElement( 'div', array( 'id' => 'premium-values' ) );
2929 $form .= Xml::openElement( 'div', array( 'id' => 'premium-size' ) );
3030 $sizeDisplay = '<span id="size-display">'.$wgRequest->getText( 'size' ).'</span>';
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/Wikipedia-ten-tshirt-back.jpg
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/includes/wikipedia-ten-tshirt-front.png
___________________________________________________________________
Added: svn:mime-type
3131 + application/octet-stream
Property changes on: branches/fundraising/deployment/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
3232 Merged /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.i18n.php:r79301-79303
Property changes on: branches/fundraising/deployment/DonationInterface
___________________________________________________________________
Modified: svn:mergeinfo
3333 Merged /trunk/extensions/DonationInterface:r79301-79303

Follow-up revisions

RevisionCommit summaryAuthorDate
r83467Merging from r79304 through r83466 of trunkawjrichards18:25, 7 March 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r79300Merge up to head of trunk from r79297. Picking up dropped translationstomasz23:01, 30 December 2010

Status & tagging log