Ejegg has submitted this change and it was merged.
Change subject: Wean remaining usages of legacy DonationInterface checkout
......................................................................
Wean remaining usages of legacy DonationInterface checkout
Change-Id: I77408d7af52d3e9df9c9092917acfcb85477c095
---
M sites/all/modules/wmf_common/wmf_common.module
M sites/all/modules/wmf_communication/MediaWikiMessages.php
2 files changed, 2 insertions(+), 13 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/wmf_common/wmf_common.module
b/sites/all/modules/wmf_common/wmf_common.module
index 31d5b62..5dc0e53 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -84,18 +84,6 @@
'#description' => t('Comma-delimited (no spaces) list of donor email
addresses that will never trigger failmail'),
);
- $di_path = variable_get('wmf_common_di_location', null);
- $di_installed = file_exists(implode(DIRECTORY_SEPARATOR, array($di_path,
'gateway_common', 'interface.i18n.php')));
- $di_msg = $di_installed ? '<span style="color:green;">Installed
Correctly</span>' : '<span style="color:red;">Please install</span>';
-
- $form['wmf_common_di_location'] = array(
- '#type' => 'textfield',
- '#title' => t('Donation Interface location'),
- '#default_value' => $di_path,
- '#required' => TRUE,
- '#description' => "{$di_msg} " . t('Filesystem path to a checkout of
Donation Interface. Try: <code>git clone
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DonationInterface.git</code>'),
- );
-
$form['wmf_common_requeue_delay'] = array(
'#type' => 'textfield',
'#title' => t('Requeue Delay Time'),
diff --git a/sites/all/modules/wmf_communication/MediaWikiMessages.php
b/sites/all/modules/wmf_communication/MediaWikiMessages.php
index 5565205..44b81d8 100644
--- a/sites/all/modules/wmf_communication/MediaWikiMessages.php
+++ b/sites/all/modules/wmf_communication/MediaWikiMessages.php
@@ -26,7 +26,8 @@
*/
protected function __construct() {
// TODO: ability to configure multiple messages sources
- $di_root = variable_get( 'wmf_common_di_location', null );
+ // FIXME: stealth dependency
+ $di_root = DRUPAL_ROOT . '/../vendor/wikimedia/DonationInterface';
if ( !is_dir( $di_root ) ) {
throw new Exception( "DonationInterface i18n libraries not found.
Path checked: {$di_root}" );
}
--
To view, visit https://gerrit.wikimedia.org/r/169510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77408d7af52d3e9df9c9092917acfcb85477c095
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
