Skip to content

Commit e9e3b37

Browse files
authored
Version 2.5.9
Merge pull request #640 from Freemius/develop
2 parents bbbcf3d + c807eef commit e9e3b37

File tree

8 files changed

+14
-20
lines changed

8 files changed

+14
-20
lines changed

includes/class-freemius.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25885,7 +25885,7 @@ private function get_gdpr_admin_notice_string( $user_plugins ) {
2588525885
'%s %s %s',
2588625886
$thank_you,
2588725887
$already_opted_in,
25888-
sprintf( $this->get_text_inline( 'Due to the new %sEU General Data Protection Regulation (GDPR)%s compliance requirements it is required that you provide your explicit consent, again, confirming that you are onboard :-)', 'due-to-gdpr-compliance-requirements' ), '<a href="https://eugdpr.org/" target="_blank" rel="noopener noreferrer">', '</a>' ) .
25888+
sprintf( $this->get_text_inline( 'Due to the new %sEU General Data Protection Regulation (GDPR)%s compliance requirements it is required that you provide your explicit consent, again, confirming that you are onboard :-)', 'due-to-gdpr-compliance-requirements' ), '<a href="https://ec.europa.eu/info/law/law-topic/data-protection_en/" target="_blank" rel="noopener noreferrer">', '</a>' ) .
2588925889
'<br><br>' .
2589025890
'<b>' . $this->get_text_inline( "Please let us know if you'd like us to contact you for security & feature updates, educational content, and occasional offers:", 'contact-for-updates' ) . '</b>' .
2589125891
$actions .

start.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
* @var string
1717
*/
18-
$this_sdk_version = '2.5.8';
18+
$this_sdk_version = '2.5.9';
1919

2020
#region SDK Selection Logic --------------------------------------------------------------------
2121

templates/account.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@
106106

107107
$has_tabs = $fs->_add_tabs_before_content();
108108

109-
if ( $has_tabs ) {
110-
$query_params['tabs'] = 'true';
111-
}
112-
113109
// Aliases.
114110
$download_latest_text = fs_text_x_inline( 'Download Latest', 'as download latest version', 'download-latest', $slug );
115111
$downgrading_plan_text = fs_text_inline( 'Downgrading your plan', 'downgrading-plan', $slug );

templates/forms/affiliation.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787

8888
$module_id = $fs->get_id();
8989
$affiliate_program_terms_url = "https://freemius.com/plugin/{$module_id}/{$slug}/legal/affiliate-program/";
90+
91+
$has_tabs = $fs->_add_tabs_before_content();
9092
?>
9193
<div id="fs_affiliation_content_wrapper" class="wrap">
9294
<form method="post" action="">
@@ -500,6 +502,10 @@ function showErrorMessage(message) {
500502
</script>
501503
</div>
502504
<?php
505+
if ( $has_tabs ) {
506+
$fs->_add_tabs_after_content();
507+
}
508+
503509
$params = array(
504510
'page' => 'affiliation',
505511
'module_id' => $module_id,

templates/gdpr-optin-js.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
allowMarketing = $this.hasClass( 'allow-marketing' ),
3030
cursor = $this.css( 'cursor' ),
3131
$products = $gdprOptinNotice.find( 'span[data-plugin-id]' ),
32-
pluginIDs = [];
32+
pluginIDs = [],
33+
ajaxUrl = <?php echo Freemius::ajax_url() ?>;
3334

3435
if ( $products.length > 0 ) {
3536
$products.each(function() {
@@ -38,7 +39,7 @@
3839
}
3940

4041
$.ajax({
41-
url : <?php echo Freemius::ajax_url() ?> + '?' + $.param({
42+
url : ajaxUrl + (ajaxUrl.includes('?') ? '&' : '?') + $.param({
4243
action : '<?php echo $fs->get_ajax_action( 'gdpr_optin_action' ) ?>',
4344
security : '<?php echo $fs->get_ajax_security( 'gdpr_optin_action' ) ?>',
4445
module_id: '<?php echo $fs->get_id() ?>'

templates/plugin-info/description.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@
5656
<ul>
5757
<?php $i = 0;
5858
foreach ( $screenshots as $s => $url ) : ?>
59-
<?php
60-
// Relative URLs are replaced with WordPress.org base URL
61-
// therefore we need to set absolute URLs.
62-
$url = 'http' . ( WP_FS__IS_HTTPS ? 's' : '' ) . ':' . $url;
63-
?>
6459
<li class="<?php echo ( 0 === $i % 2 ) ? 'odd' : 'even' ?>">
6560
<style>
6661
#section-description .fs-screenshots <?php echo ".fs-screenshot-{$i}" ?>

templates/plugin-info/screenshots.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
<ol>
2323
<?php $i = 0;
2424
foreach ( $screenshots as $s => $url ) : ?>
25-
<?php
26-
// Relative URLs are replaced with WordPress.org base URL
27-
// therefore we need to set absolute URLs.
28-
$url = 'http' . ( WP_FS__IS_HTTPS ? 's' : '' ) . ':' . $url;
29-
?>
3025
<li>
3126
<a href="<?php echo $url ?>" title="<?php echo esc_attr( sprintf( fs_text_inline( 'Click to view full-size screenshot %d', 'view-full-size-x', $plugin->slug ), $i ) ) ?>"><img src="<?php echo $url ?>"></a>
3227
</li>

templates/tabs-capture-js.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@
4242
if (-1 < tabsPosition) {
4343
aboveTabsHtml = settingHtml.substr(0, tabsPosition);
4444

45-
var tabsHtml = $('.wrap .nav-tab-wrapper').clone().wrap('<div>').parent().html();
45+
var tabsHtml = $('.wrap .nav-tab-wrapper').clone().wrap('<div>').parent().html(),
46+
ajaxUrl = <?php echo Freemius::ajax_url() ?>;
4647

4748
$.ajax({
48-
url : <?php echo Freemius::ajax_url() ?> + '?' + $.param({
49+
url : ajaxUrl + (ajaxUrl.includes('?') ? '&' : '?') + $.param({
4950
action : '<?php echo $fs->get_ajax_action( 'store_tabs' ) ?>',
5051
security : '<?php echo $fs->get_ajax_security( 'store_tabs' ) ?>',
5152
module_id: '<?php echo $fs->get_id() ?>'

0 commit comments

Comments
 (0)