Mwalker has submitted this change and it was merged.
Change subject: payflow-audit reads config from /etc/fundraising
......................................................................
payflow-audit reads config from /etc/fundraising
probably harmless to merge as we are not using.
Change-Id: Id26132d60de0991aa73ee615f970b641ef43488e
---
M audit/payflow/PayflowAudit.php
M audit/payflow/PayflowReports.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/audit/payflow/PayflowAudit.php b/audit/payflow/PayflowAudit.php
index e9f089a..c0dd060 100644
--- a/audit/payflow/PayflowAudit.php
+++ b/audit/payflow/PayflowAudit.php
@@ -54,7 +54,7 @@
// Civi lookup function
public function inCivi( $id ) {
- $conf = parse_ini_file( 'auth.cfg' );
+ $conf = parse_ini_file( '/etc/fundraising/auth.cfg' );
$db = mysql_connect( $conf['db_server'], $conf['db_user'],
$conf['db_pass']);
if ( ! $db ) {
diff --git a/audit/payflow/PayflowReports.php b/audit/payflow/PayflowReports.php
index 79baed0..30ffe37 100644
--- a/audit/payflow/PayflowReports.php
+++ b/audit/payflow/PayflowReports.php
@@ -351,7 +351,7 @@
}
public function loadAuthData() {
- $config = 'auth.cfg';
+ $config = '/etc/fundraising/auth.cfg';
$auth = parse_ini_file( $config );
$this->vendor = $auth['vendor'];
--
To view, visit https://gerrit.wikimedia.org/r/134726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id26132d60de0991aa73ee615f970b641ef43488e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw <awi...@wikimedia.org>
Gerrit-Reviewer: Jgreen <jgr...@wikimedia.org>
Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
