Version 2.5.9

Merge pull request #640 from Freemius/develop

Author: swashata

includes/class-freemius.php

@@ -25885,7 +25885,7 @@ private function get_gdpr_admin_notice_string( $user_plugins ) {
                 '%s %s %s',
                 $thank_you,
                 $already_opted_in,
-                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>' ) .
+                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>' ) .
                 '<br><br>' .
                 '<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>' .
                 $actions .

start.php

@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '2.5.8';
+	$this_sdk_version = '2.5.9';
 
 	#region SDK Selection Logic --------------------------------------------------------------------
 

templates/account.php

@@ -106,10 +106,6 @@
 
     $has_tabs = $fs->_add_tabs_before_content();
 
-	if ( $has_tabs ) {
-		$query_params['tabs'] = 'true';
-	}
-
 	// Aliases.
 	$download_latest_text         = fs_text_x_inline( 'Download Latest', 'as download latest version', 'download-latest', $slug );
 	$downgrading_plan_text        = fs_text_inline( 'Downgrading your plan', 'downgrading-plan', $slug );

templates/forms/affiliation.php

@@ -87,6 +87,8 @@
 
     $module_id                   = $fs->get_id();
     $affiliate_program_terms_url = "https://freemius.com/plugin/{$module_id}/{$slug}/legal/affiliate-program/";
+
+    $has_tabs = $fs->_add_tabs_before_content();
 ?>
 <div id="fs_affiliation_content_wrapper" class="wrap">
     <form method="post" action="">
@@ -500,6 +502,10 @@ function showErrorMessage(message) {
         </script>
     </div>
 <?php
+    if ( $has_tabs ) {
+        $fs->_add_tabs_after_content();
+    }
+
     $params = array(
         'page'           => 'affiliation',
         'module_id'      => $module_id,

templates/gdpr-optin-js.php

@@ -29,7 +29,8 @@
                     allowMarketing = $this.hasClass( 'allow-marketing' ),
                     cursor         = $this.css( 'cursor' ),
                     $products      = $gdprOptinNotice.find( 'span[data-plugin-id]' ),
-                    pluginIDs      = [];
+                    pluginIDs      = [],
+                    ajaxUrl        = <?php echo Freemius::ajax_url() ?>;
 
                 if ( $products.length > 0 ) {
                     $products.each(function() {
@@ -38,7 +39,7 @@
                 }
 
                 $.ajax({
-                    url       : <?php echo Freemius::ajax_url() ?> + '?' + $.param({
+                        url      : ajaxUrl + (ajaxUrl.includes('?') ? '&' : '?') + $.param({
                         action   : '<?php echo $fs->get_ajax_action( 'gdpr_optin_action' ) ?>',
                         security : '<?php echo $fs->get_ajax_security( 'gdpr_optin_action' ) ?>',
                         module_id: '<?php echo $fs->get_id() ?>'

templates/plugin-info/description.php

@@ -56,11 +56,6 @@
 		<ul>
 			<?php $i = 0;
 				foreach ( $screenshots as $s => $url ) : ?>
-					<?php
-					// Relative URLs are replaced with WordPress.org base URL
-					// therefore we need to set absolute URLs.
-					$url = 'http' . ( WP_FS__IS_HTTPS ? 's' : '' ) . ':' . $url;
-					?>
 					<li class="<?php echo ( 0 === $i % 2 ) ? 'odd' : 'even' ?>">
 						<style>
 							#section-description .fs-screenshots <?php echo ".fs-screenshot-{$i}" ?>

templates/plugin-info/screenshots.php

@@ -22,11 +22,6 @@
 <ol>
 	<?php $i = 0;
 		foreach ( $screenshots as $s => $url ) : ?>
-			<?php
-			// Relative URLs are replaced with WordPress.org base URL
-			// therefore we need to set absolute URLs.
-			$url = 'http' . ( WP_FS__IS_HTTPS ? 's' : '' ) . ':' . $url;
-			?>
 			<li>
 				<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>
 			</li>

templates/tabs-capture-js.php

@@ -42,10 +42,11 @@
 				if (-1 < tabsPosition) {
 					aboveTabsHtml = settingHtml.substr(0, tabsPosition);
 
-					var tabsHtml = $('.wrap .nav-tab-wrapper').clone().wrap('<div>').parent().html();
+					var tabsHtml = $('.wrap .nav-tab-wrapper').clone().wrap('<div>').parent().html(),
+						ajaxUrl  = <?php echo Freemius::ajax_url() ?>;
 
 					$.ajax({
-						url        : <?php echo Freemius::ajax_url() ?> + '?' + $.param({
+							url      : ajaxUrl + (ajaxUrl.includes('?') ? '&' : '?') + $.param({
 							action   : '<?php echo $fs->get_ajax_action( 'store_tabs' ) ?>',
 							security : '<?php echo $fs->get_ajax_security( 'store_tabs' ) ?>',
 							module_id: '<?php echo $fs->get_id() ?>'