Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298022
Change subject: Put referrer back in session again
......................................................................
Put referrer back in session again
Regression caused by 15608d10497b969e - I forgot to check what else
was using getMessageFields.
Bug: T139753
Change-Id: Ie91519982df43ffbff9473a991ebd3a41929988a
---
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
2 files changed, 14 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/22/298022/1
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index dba7860..4c02073 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -954,6 +954,17 @@
}
/**
+ * Returns an array of names of fields we store in session
+ */
+ public static function getSessionFields() {
+ $fields = self::getMessageFields();
+ $fields[] = 'order_id';
+ $fields[] = 'appeal';
+ $fields[] = 'referrer';
+ return $fields;
+ }
+
+ /**
* Basically, this is a wrapper for the WebRequest wasPosted function
that
* won't give us notices if we weren't even a web request.
* I realize this is pretty lame.
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index 7847f14..0f98a0d 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -2796,13 +2796,11 @@
public function session_addDonorData() {
$this->logger->info( __FUNCTION__ . ': Refreshing all donor
data' );
$this->session_ensure();
- $donordata = DonationData::getMessageFields();
- $donordata[] = 'order_id';
- $donordata[] = 'appeal';
+ $sessionFields = DonationData::getSessionFields();
$data = array();
- foreach ( $donordata as $item ) {
- $data[$item] = $this->getData_Unstaged_Escaped( $item );
+ foreach ( $sessionFields as $field ) {
+ $data[$field] = $this->getData_Unstaged_Escaped( $field
);
}
$this->request->setSessionData( 'Donor', $data );
}
--
To view, visit https://gerrit.wikimedia.org/r/298022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie91519982df43ffbff9473a991ebd3a41929988a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
