Skip to content

Commit 3e04a06

Browse files
committed
Removes MonkeyRewards
1 parent 292d89d commit 3e04a06

File tree

6 files changed

+6
-45
lines changed

6 files changed

+6
-45
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ This section describes how to install the plugin and get started using it.
2929
3. Navigate to **Settings** click **Mailchimp Setup**.
3030
4. Enter your Mailchimp API Key and let the plugin verify it.
3131
5. Select the list where you want to send new Mailchimp subscribers.
32-
6. Optional: turn **MonkeyRewards** on or off.
33-
7. Optional: Turn **Merge Fields** and **Groups** on or off. Navigate to **Appearance**, and click **Widgets**. Drag the Mailchimp Widget into one of your Widget Areas.
32+
6. Optional: Turn **Merge Fields** and **Groups** on or off. Navigate to **Appearance**, and click **Widgets**. Drag the Mailchimp Widget into one of your Widget Areas.
3433

3534
![Selecting your Mailchimp list](https://github.com/mailchimp/wordpress/blob/develop/.wordpress-org/screenshot-2.jpg?raw=true)
3635

mailchimp.php

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535

3636
// Version constant for easy CSS refreshes
37-
define( 'MCSF_VER', '1.5.8' );
37+
define( 'MCSF_VER', '1.6.0' );
3838

3939
// What's our permission (capability) threshold
4040
define( 'MCSF_CAP_THRESHOLD', 'manage_options' );
@@ -54,6 +54,9 @@
5454
// includes the backwards compatibility functions
5555
require_once 'mailchimp_compat.php';
5656

57+
// Upgrade routines.
58+
require_once 'mailchimp_upgrade.php';
59+
5760
/**
5861
* Do the following plugin setup steps here
5962
*
@@ -414,7 +417,6 @@ function mailchimp_sf_delete_setup() {
414417
'mc_sopresto_user',
415418
'mc_sopresto_public_key',
416419
'mc_sopresto_secret_key',
417-
'mc_rewards',
418420
'mc_use_javascript',
419421
'mc_use_datepicker',
420422
'mc_use_unsub_link',
@@ -501,15 +503,6 @@ function mailchimp_sf_set_form_defaults( $list_name = '' ) {
501503
function mailchimp_sf_save_general_form_settings() {
502504

503505
// IF NOT DEV MODE
504-
if ( isset( $_POST['mc_rewards'] ) ) {
505-
update_option( 'mc_rewards', 'on' );
506-
$msg = '<p class="success_msg">' . __( 'Monkey Rewards turned On!', 'mailchimp_i18n' ) . '</p>';
507-
mailchimp_sf_global_msg( $msg );
508-
} elseif ( get_option( 'mc_rewards' ) !== 'off' ) {
509-
update_option( 'mc_rewards', 'off' );
510-
$msg = '<p class="success_msg">' . __( 'Monkey Rewards turned Off!', 'mailchimp_i18n' ) . '</p>';
511-
mailchimp_sf_global_msg( $msg );
512-
}
513506
if ( isset( $_POST['mc_use_javascript'] ) ) {
514507
update_option( 'mc_use_javascript', 'on' );
515508
$msg = '<p class="success_msg">' . __( 'Fancy Javascript submission turned On!', 'mailchimp_i18n' ) . '</p>';

mailchimp_widget.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,6 @@ function mailchimp_sf_signup_form( $args = array() ) {
262262
</div><!-- /mc_unsub_link -->
263263
<?php
264264
}
265-
if ( $user && get_option( 'mc_rewards' ) === 'on' ) {
266-
?>
267-
<br/>
268-
<div id="mc_display_rewards" align="center">
269-
<?php esc_html_e( 'powered by', 'mailchimp_i18n' ); ?> <a href="<?php echo esc_url( 'http://www.mailchimp.com/affiliates/?aid=' . $user['account_id'] . '&amp;afl=1' ); ?>">Mailchimp</a>!
270-
</div><!-- /mc_display_rewards -->
271-
<?php
272-
}
273265
?>
274266

275267
</div><!-- /mc_form_inside -->

readme.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ This section describes how to install the plugin and get started using it.
2727
3. Navigate to **Settings** click **Mailchimp Setup**.
2828
4. Enter your Mailchimp API Key and let the plugin verify it.
2929
5. Select the list where you want to send new Mailchimp subscribers.
30-
6. Optional: turn **MonkeyRewards** on or off.
31-
7. Optional: Turn **Merge Fields** and **Groups** on or off. Navigate to **Appearance**, and click **Widgets**. Drag the Mailchimp Widget into one of your Widget Areas.
30+
6. Optional: Turn **Merge Fields** and **Groups** on or off. Navigate to **Appearance**, and click **Widgets**. Drag the Mailchimp Widget into one of your Widget Areas.
3231

3332
= Advanced =
3433

views/css/frontend.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
#mc-indicates-required {
5656
width:100%;
5757
}
58-
#mc_display_rewards {}
5958
.mc_interests_header {
6059
font-weight:bold;
6160
}

views/setup_page.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -260,27 +260,6 @@
260260

261261
<table class="widefat mc-widefat">
262262
<tr><th colspan="2">List Options</th></tr>
263-
<tr valign="top">
264-
<th scope="row"><?php esc_html_e( 'MonkeyRewards', 'mailchimp_i18n' ); ?>?</th>
265-
<td><input name="mc_rewards" type="checkbox"<?php if ( get_option( 'mc_rewards' ) === 'on' || get_option( 'mc_rewards' ) === '' ) { echo ' checked="checked"'; } ?> id="mc_rewards" class="code" />
266-
<em><label for="mc_rewards">
267-
<?php
268-
echo wp_kses(
269-
__(
270-
'We\'ll add a "powered by Mailchimp" link to your form that will help you earn <a href="http://kb.mailchimp.com/accounts/account-setup/monkeyrewards-credits" target="_blank">MonkeyRewards</a>. You can turn it off at any time.',
271-
'mailchimp_i18n'
272-
),
273-
[
274-
'a' => [
275-
'href',
276-
'target',
277-
],
278-
]
279-
);
280-
?>
281-
</label></em>
282-
</td>
283-
</tr>
284263

285264
<tr valign="top">
286265
<th scope="row"><?php esc_html_e( 'Use JavaScript Support?', 'mailchimp_i18n' ); ?></th>

0 commit comments

Comments
 (0)