AMP for WP – Accelerated Mobile Pages - Version 1.0.70

Version Description

(7th December 2020) = * Improvement: Added filter to modify author bio description #4849 * Improvement: Added LGDP (Brazil's GDPR) #4854 * Fixed: Ads are displaying even GDPR popup is rejected #4843 * Fixed: Role Based Access not working for SEO manager role in Yoast #4830 * Fixed: Homepage url not redirecting to non-amp url with AMP takeover and ?amp #4826 * Fixed: The amphtml not generating with the Hide By Default option in AMP Takeover #4824 * Fixed: Undefined variable: allscripts #4846 * Fixed: Breadcrumb bug in amp homepage #4827 * Fixed: When the minify option is disabled then the WhatsApp share link has a space #4848 * Fixed: Validation error when using web stories plugin #4847 * Fixed: The background color of feature module of layout2 is not getting applied #4835 * Fixed: Canonical and meta description errors in All in one SEO PRO #4829 * Fixed: Avatar image doesn't have alt attribute #4836 * Fixed: AMP posts are redirecting to the 404 page when post id is added in permalink #4842 * Fixed: The amphtml not generating on the custom taxonomy and the custom post types #4841

Download this release

Release Info

Developer mohammed_kaludi
Plugin Icon 128x128 AMP for WP – Accelerated Mobile Pages
Version 1.0.70
Comparing to
See all releases

Code changes from version 1.0.69.2 to 1.0.70

Files changed (20) hide show
  1. README.md +18 -39
  2. accelerated-moblie-pages.php +14 -12
  3. changelog.txt +17 -0
  4. components/author-box/author-box.php +17 -4
  5. components/gdpr/gdpr.php +1 -1
  6. includes/admin-script.js +0 -12
  7. includes/features/advertisement/ads-functions.php +6 -6
  8. includes/options/admin-config.php +22 -26
  9. includes/options/redux-core/assets/css/redux-admin.css +1 -1
  10. includes/redirect.php +2 -2
  11. includes/vendor/amp/includes/amp-post-template-actions.php +3 -0
  12. pagebuilder/inc/viewShowFrontData.php +6 -2
  13. readme.txt +18 -39
  14. templates/design-manager/design-1/elements/social-icons.php +1 -1
  15. templates/design-manager/design-2/elements/social-icons.php +1 -1
  16. templates/design-manager/design-3/elements/social-icons.php +1 -1
  17. templates/design-manager/swift/footer.php +1 -1
  18. templates/design-manager/swift/functions.php +1 -1
  19. templates/features.php +45 -56
  20. uninstall.php +1 -0
README.md CHANGED
@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.6
7
- Stable tag: 1.0.69.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -193,48 +193,27 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
193
 
194
  == Changelog ==
195
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
196
  = 1.0.69.2 (27th November 2020) =
197
  * Fixed: Improvements in offer banner #4833
198
 
199
  = 1.0.69.1 (25th November 2020) =
200
  * Fixed: amp-story-player was found on this page, but is unused. #4839
201
 
202
- = 1.0.69 (25th November 2020) =
203
- * Fixed: Wrong tooltip link in the infinite scroll #4823
204
- * Fixed: Images are not showing in the AMP due to SG Optimizer lazy load #4815
205
- * Fixed: Embeds not working in AMP Takeover mode #4819
206
- * Fixed: AMPHTML appearing in archive page of Google web stories #4820
207
- * Fixed: AMP option panel page is blank with ECPay Payment for WooCommerce plugin #4816
208
- * Fixed: 404 errors on pagination urls #4373
209
- * Fixed: Blank lines not appearing between paragraphs #4818
210
- * Fixed: amp-story-player preload is being added when not using #4828
211
-
212
- = 1.0.68.1 (10th November 2020) =
213
- * Fixed: Missing amphtml on product pages #4822
214
- * Fixed: Debug warnings #4821
215
-
216
- = 1.0.68 (9th November 2020) =
217
- * Fixed: Validation error occurs when input type image is added #4785
218
- * Fixed: Featured images are not showing when "Enable lazy load images" option is enabled in the "DEUS" Theme #4710
219
- * Fixed: AMP Push Notification - Dropdown issue #4812
220
- * Fixed: Italic style caption of gallery #4806
221
- * Fixed: The canonical links are not generating for the coupon store when YOAST Plugin is active with AMPFORWP #4811
222
- * Fixed: Content not displayed in AMP post/pages with plain permalink #4814
223
- * Fixed: Tables created with 2 columns displaying 1 extra column on mobile view #4765
224
- * Fixed: Content appearing in excerpt on single post #4798
225
- * Fixed: Code improvment for amp pagebuilder's category-module #4660
226
-
227
- = 1.0.67 (4th November 2020) =
228
- * Improvement: Optimize Pagespeed score by implimenting AMP video lightbox #4531
229
- * Improvement: Added Paid Memberships PRO for AMP Extension #4737
230
- * Improvement: Added help section for the users in Options panel #4683
231
- * Improvement: Added code improvement in Tag base remover and category base remover #4664
232
- * Improvement: Added UberMenu 3 Compatiblity #4732
233
- * Improvement: Added filter to overwrite the scripts #4642
234
- * Fixed: Style amp-custom unterminated comment Error on AMP #4792
235
- * Fixed: Proper styling of Header right side icons in Design 2 #3935
236
- * Fixed: Revolution Slider not working in AMP #4669
237
- * Fixed: Additional characters at the end of footer text in Design Two #4805
238
- * Fixed: Related thumbnail image title is getting break and leading to the validation error #4804
239
-
240
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.6
7
+ Stable tag: 1.0.70
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
193
 
194
  == Changelog ==
195
 
196
+ = 1.0.70 (7th December 2020) =
197
+ * Improvement: Added filter to modify author bio description #4849
198
+ * Improvement: Added LGDP (Brazil's GDPR) #4854
199
+ * Fixed: Ads are displaying even GDPR popup is rejected #4843
200
+ * Fixed: Role Based Access not working for SEO manager role in Yoast #4830
201
+ * Fixed: Homepage url not redirecting to non-amp url with AMP takeover and ?amp #4826
202
+ * Fixed: The amphtml not generating with the Hide By Default option in AMP Takeover #4824
203
+ * Fixed: Undefined variable: allscripts #4846
204
+ * Fixed: Breadcrumb bug in amp homepage #4827
205
+ * Fixed: When the minify option is disabled then the WhatsApp share link has a space #4848
206
+ * Fixed: Validation error when using web stories plugin #4847
207
+ * Fixed: The background color of feature module of layout2 is not getting applied #4835
208
+ * Fixed: Canonical and meta description errors in All in one SEO PRO #4829
209
+ * Fixed: Avatar image doesn't have alt attribute #4836
210
+ * Fixed: AMP posts are redirecting to the 404 page when post id is added in permalink #4842
211
+ * Fixed: The amphtml not generating on the custom taxonomy and the custom post types #4841
212
+
213
  = 1.0.69.2 (27th November 2020) =
214
  * Fixed: Improvements in offer banner #4833
215
 
216
  = 1.0.69.1 (25th November 2020) =
217
  * Fixed: amp-story-player was found on this page, but is unused. #4839
218
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
219
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
accelerated-moblie-pages.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
- Version: 1.0.69.2
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
@@ -20,7 +20,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
20
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23
- define('AMPFORWP_VERSION','1.0.69.2');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
@@ -301,16 +301,18 @@ function ampforwp_add_custom_rewrite_rules() {
301
  }
302
  }
303
  }
304
- add_rewrite_rule(
305
- '(.+?)-[0-9]+\/([0-9]{1,})\/amp$',
306
- 'index.php?amp=1&name=$matches[1]&paged=$matches[2]',
307
- 'top'
308
- );
309
- add_rewrite_rule(
310
- '(.+?)\/([0-9]{1,})\/amp$',
311
- 'index.php?amp=1&name=$matches[1]&paged=$matches[2]',
312
- 'top'
313
- );
 
 
314
  }
315
  add_action( 'init', 'ampforwp_add_custom_rewrite_rules', 25 );
316
  // Delete category_base transient when it is updated #2924
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
+ Version: 1.0.70
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
20
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23
+ define('AMPFORWP_VERSION','1.0.70');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
301
  }
302
  }
303
  }
304
+ if (ampforwp_get_setting('ampforwp-pagination-link-type') && is_singular()) {
305
+ add_rewrite_rule(
306
+ '(.+?)-[0-9]+\/([0-9]{1,})\/amp$',
307
+ 'index.php?amp=1&name=$matches[1]&paged=$matches[2]',
308
+ 'top'
309
+ );
310
+ add_rewrite_rule(
311
+ '(.+?)\/([0-9]{1,})\/amp$',
312
+ 'index.php?amp=1&name=$matches[1]&paged=$matches[2]',
313
+ 'top'
314
+ );
315
+ }
316
  }
317
  add_action( 'init', 'ampforwp_add_custom_rewrite_rules', 25 );
318
  // Delete category_base transient when it is updated #2924
changelog.txt CHANGED
@@ -1,5 +1,22 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 1.0.69.2 (27th November 2020) =
4
  * Fixed: Improvements in offer banner #4833
5
 
1
  == Changelog ==
2
 
3
+ = 1.0.70 (7th December 2020) =
4
+ * Improvement: Added filter to modify author bio description #4849
5
+ * Improvement: Added LGDP (Brazil's GDPR) #4854
6
+ * Fixed: Ads are displaying even GDPR popup is rejected #4843
7
+ * Fixed: Role Based Access not working for SEO manager role in Yoast #4830
8
+ * Fixed: Homepage url not redirecting to non-amp url with AMP takeover and ?amp #4826
9
+ * Fixed: The amphtml not generating with the Hide By Default option in AMP Takeover #4824
10
+ * Fixed: Undefined variable: allscripts #4846
11
+ * Fixed: Breadcrumb bug in amp homepage #4827
12
+ * Fixed: When the minify option is disabled then the WhatsApp share link has a space #4848
13
+ * Fixed: Validation error when using web stories plugin #4847
14
+ * Fixed: The background color of feature module of layout2 is not getting applied #4835
15
+ * Fixed: Canonical and meta description errors in All in one SEO PRO #4829
16
+ * Fixed: Avatar image doesn't have alt attribute #4836
17
+ * Fixed: AMP posts are redirecting to the 404 page when post id is added in permalink #4842
18
+ * Fixed: The amphtml not generating on the custom taxonomy and the custom post types #4841
19
+
20
  = 1.0.69.2 (27th November 2020) =
21
  * Fixed: Improvements in offer banner #4833
22
 
components/author-box/author-box.php CHANGED
@@ -32,7 +32,7 @@ $author_link = get_author_posts_url($post_author->ID);
32
  if ( function_exists('coauthors_posts_links') ) {
33
  $author_link = coauthors_posts_links($and_text,$and_text,null,null,false);
34
  }
35
- $author_image_wrapper = '';
36
 
37
  if ( isset($args['author_pub_name']) ) {
38
  $author_pub_name = $args['author_pub_name'];
@@ -95,9 +95,20 @@ if ( isset($args['show_time']) ) {
95
  $author_avatar_url = ampforwp_get_wp_user_avatar();
96
  if( null == $author_avatar_url ){
97
  $author_avatar_url = get_avatar_url( $post_author->ID, array( 'size' => $avatar_size ) );
98
- } ?>
 
 
 
 
 
 
 
 
 
 
 
99
  <div class="amp-author-image <?php echo esc_attr($author_image_wrapper); ?>">
100
- <amp-img <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>src="<?php echo esc_url($author_avatar_url); ?>" width="<?php echo esc_attr($avatar_size_width); ?>" height="<?php echo esc_attr($avatar_size_height); ?>" layout="fixed"></amp-img>
101
  </div>
102
  <?php } ?>
103
  <?php echo '<div class="author-details '. esc_attr($author_wrapper_class) .'">';
@@ -144,7 +155,9 @@ if ( isset($args['show_time']) ) {
144
  if ( $author_description ) {
145
  if( true == ampforwp_get_setting('amp-author-box-description') ){
146
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
147
- echo "<p>".strip_tags($post_author->description,$allowed_tags)."</p>";
 
 
148
  }
149
  } ?>
150
  </div>
32
  if ( function_exists('coauthors_posts_links') ) {
33
  $author_link = coauthors_posts_links($and_text,$and_text,null,null,false);
34
  }
35
+ $author_image_wrapper = $alt = '';
36
 
37
  if ( isset($args['author_pub_name']) ) {
38
  $author_pub_name = $args['author_pub_name'];
95
  $author_avatar_url = ampforwp_get_wp_user_avatar();
96
  if( null == $author_avatar_url ){
97
  $author_avatar_url = get_avatar_url( $post_author->ID, array( 'size' => $avatar_size ) );
98
+ }
99
+ if(class_exists('WP_User_Avatar_Functions')){
100
+ $image = get_wp_user_avatar();
101
+ if (!empty($image)) {
102
+ preg_match_all( '@alt="([^"]+)"@' , $image, $match );
103
+ $alt = array_pop($match);
104
+ if (isset($alt[0])) {
105
+ $alt = 'alt=' . $alt[0];
106
+ }
107
+ }
108
+ }
109
+ ?>
110
  <div class="amp-author-image <?php echo esc_attr($author_image_wrapper); ?>">
111
+ <amp-img <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>src="<?php echo esc_url($author_avatar_url); ?>" <?php echo esc_attr($alt); ?> width="<?php echo esc_attr($avatar_size_width); ?>" height="<?php echo esc_attr($avatar_size_height); ?>" layout="fixed"></amp-img>
112
  </div>
113
  <?php } ?>
114
  <?php echo '<div class="author-details '. esc_attr($author_wrapper_class) .'">';
155
  if ( $author_description ) {
156
  if( true == ampforwp_get_setting('amp-author-box-description') ){
157
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
158
+ $author_description = "<p>".strip_tags($post_author->description,$allowed_tags)."</p>";
159
+ $author_description = apply_filters( 'ampforwp_author_description', $author_description);
160
+ echo $author_description;
161
  }
162
  } ?>
163
  </div>
components/gdpr/gdpr.php CHANGED
@@ -21,7 +21,7 @@ function amp_gdpr_output(){
21
  if(isset($redux_builder_amp['amp-gdpr-compliance-privacy-page-button-text']) && $redux_builder_amp['amp-gdpr-compliance-privacy-page-button-text']){
22
  $privacy_button_text = $redux_builder_amp['amp-gdpr-compliance-privacy-page-button-text'];
23
  }
24
- $gdpr_countries = array("AT","BE", "BG", "HR", "CY", "CZ", "DK", "EE", "FI", "FR", "DE", "GR", "HU", "IS", "IE", "IT", "LV", "LI", "LT", "LU", "MT", "NL", "NO", "PL", "PT", "RO", "SK", "SI", "ES", "SE", "GB", "AX", "IC", "EA", "GF", "PF", "TF", "GI", "GP", "GG", "JE", "MQ", "YT", "NC", "RE", "BL", "MF", "PM", "SJ", "VA", "WF", "EZ", "CH");
25
  $gdpr_countries = apply_filters( 'ampforwp_gdpr_country_list' , $gdpr_countries );
26
  $gdpr_text = array("headline"=>$headline,"user_data"=>$user_data,"accept"=>$accept,"reject"=>$reject,"settings"=>$settings,"more_info "=>$more_info,"privacy_button_text"=>$privacy_button_text );
27
  $gdpr_text = apply_filters('ampforwp_modify_gdpr_output',$gdpr_text);
21
  if(isset($redux_builder_amp['amp-gdpr-compliance-privacy-page-button-text']) && $redux_builder_amp['amp-gdpr-compliance-privacy-page-button-text']){
22
  $privacy_button_text = $redux_builder_amp['amp-gdpr-compliance-privacy-page-button-text'];
23
  }
24
+ $gdpr_countries = array("AT","BE", "BG", "HR", "CY", "CZ", "DK", "EE", "FI", "FR", "DE", "GR", "HU", "IS", "IE", "IT", "LV", "LI", "LT", "LU", "MT", "NL", "NO", "PL", "PT", "RO", "SK", "SI", "ES", "SE", "GB", "AX", "IC", "EA", "GF", "PF", "TF", "GI", "GP", "GG", "JE", "MQ", "YT", "NC", "RE", "BL", "MF", "PM", "SJ", "VA", "WF", "EZ", "CH","BR");
25
  $gdpr_countries = apply_filters( 'ampforwp_gdpr_country_list' , $gdpr_countries );
26
  $gdpr_text = array("headline"=>$headline,"user_data"=>$user_data,"accept"=>$accept,"reject"=>$reject,"settings"=>$settings,"more_info "=>$more_info,"privacy_button_text"=>$privacy_button_text );
27
  $gdpr_text = apply_filters('ampforwp_modify_gdpr_output',$gdpr_text);
includes/admin-script.js CHANGED
@@ -2592,18 +2592,6 @@ $("#subscribe-newsletter-form").on('submit',function(e){
2592
  var checkBoxes = $(this).children('input:radio')
2593
  checkBoxes.prop("checked", "true");
2594
  });
2595
- $("#amp-close").click(function(){
2596
- $(".wrapper-discount").remove();
2597
- });
2598
- $("#amp-close").click(function(){
2599
- url: ajaxurl;
2600
- var data = {
2601
- action: 'ampforwp_dismiss_discount_btn',
2602
- };
2603
- $.post(ajaxurl, data, function(response) {
2604
- $(".wrapper-discount").remove();
2605
- });
2606
- });
2607
  $("#ampforwp-close-notice").click(function(){
2608
  var data = {
2609
  action: 'ampforwp_feedback_remove_notice',
2592
  var checkBoxes = $(this).children('input:radio')
2593
  checkBoxes.prop("checked", "true");
2594
  });
 
 
 
 
 
 
 
 
 
 
 
 
2595
  $("#ampforwp-close-notice").click(function(){
2596
  var data = {
2597
  action: 'ampforwp_feedback_remove_notice',
includes/features/advertisement/ads-functions.php CHANGED
@@ -70,7 +70,7 @@ function ampforwp_header_advert() {
70
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-1').'"
71
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-1') .'"';
72
  if($is_dboc){
73
- $output .= 'data-block-on-consent';
74
  }
75
  if ( $responsive ) {
76
  $output .= 'data-auto-format="rspv"
@@ -146,7 +146,7 @@ function ampforwp_footer_advert() {
146
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-2').'"
147
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-2') .'"';
148
  if($is_dboc){
149
- $output .= 'data-block-on-consent';
150
  }
151
  if ( $responsive ) {
152
  $output .= 'data-auto-format="rspv"
@@ -241,7 +241,7 @@ function ampforwp_before_post_content_advert() {
241
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-3').'"
242
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-3') .'"';
243
  if($is_dboc){
244
- $output .= 'data-block-on-consent';
245
  }
246
  if ( $responsive ) {
247
  $output .= 'data-auto-format="rspv"
@@ -324,7 +324,7 @@ function ampforwp_after_post_content_advert() {
324
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-4').'"
325
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-4') .'"';
326
  if($is_dboc){
327
- $output .= 'data-block-on-consent';
328
  }
329
  if ( $responsive ) {
330
  $output .= 'data-auto-format="rspv"
@@ -395,7 +395,7 @@ function ampforwp_below_the_title_advert() {
395
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-5').'"
396
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-5') .'"';
397
  if($is_dboc){
398
- $output .= 'data-block-on-consent';
399
  }
400
  if ( $responsive ) {
401
  $output .= 'data-auto-format="rspv"
@@ -469,7 +469,7 @@ function ampforwp_above_related_post_advert() {
469
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-6').'"
470
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-6') .'"';
471
  if($is_dboc){
472
- $output .= 'data-block-on-consent';
473
  }
474
  if ( $responsive ) {
475
  $output .= 'data-auto-format="rspv"
70
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-1').'"
71
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-1') .'"';
72
  if($is_dboc){
73
+ $output .= 'data-block-on-consent="_till_accepted"';
74
  }
75
  if ( $responsive ) {
76
  $output .= 'data-auto-format="rspv"
146
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-2').'"
147
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-2') .'"';
148
  if($is_dboc){
149
+ $output .= 'data-block-on-consent="_till_accepted"';
150
  }
151
  if ( $responsive ) {
152
  $output .= 'data-auto-format="rspv"
241
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-3').'"
242
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-3') .'"';
243
  if($is_dboc){
244
+ $output .= 'data-block-on-consent="_till_accepted"';
245
  }
246
  if ( $responsive ) {
247
  $output .= 'data-auto-format="rspv"
324
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-4').'"
325
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-4') .'"';
326
  if($is_dboc){
327
+ $output .= 'data-block-on-consent="_till_accepted"';
328
  }
329
  if ( $responsive ) {
330
  $output .= 'data-auto-format="rspv"
395
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-5').'"
396
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-5') .'"';
397
  if($is_dboc){
398
+ $output .= 'data-block-on-consent="_till_accepted"';
399
  }
400
  if ( $responsive ) {
401
  $output .= 'data-auto-format="rspv"
469
  data-ad-client="'. ampforwp_get_setting('enable-amp-ads-text-feild-client-6').'"
470
  data-ad-slot="'. ampforwp_get_setting('enable-amp-ads-text-feild-slot-6') .'"';
471
  if($is_dboc){
472
+ $output .= 'data-block-on-consent="_till_accepted"';
473
  }
474
  if ( $responsive ) {
475
  $output .= 'data-auto-format="rspv"
includes/options/admin-config.php CHANGED
@@ -892,8 +892,7 @@ $freepro_listing = '
892
  <span class="ov"></span>
893
  </div>
894
  <div class="fp-cnt">
895
- <h1>Black Friday & Cyber Monday Deal</h1>
896
- <h2>Flat 50% discount on all the products for a very limited time</h2>
897
  <p>Take your AMP to the next level with more beautiful themes, great extensions and more powerful features.</p>
898
  <a class="buy" href="#upgrade">BUY NOW</a>
899
  </div>
@@ -1046,11 +1045,11 @@ $freepro_listing = '
1046
  </div>
1047
  <div class="pri-lst">
1048
  <div class="pri-tb">
1049
- <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&discount=BFCM2020&download_id=24570&edd_options[price_id]=1">
1050
  <h5>PERSONAL</h5>
1051
  <span class="d-amt"><sup>$</sup>149</span>
1052
- <span class="amt"><sup>$</sup>74</span>
1053
- <span class="s-amt">(Save $75)</span>
1054
  <span class="bil">Billed Annually</span>
1055
  <span class="s">1 Site License</span>
1056
  <span class="e">E-mail support</span>
@@ -1060,11 +1059,11 @@ $freepro_listing = '
1060
  </a>
1061
  </div>
1062
  <div class="pri-tb rec">
1063
- <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&discount=BFCM2020&download_id=24570&edd_options[price_id]=2">
1064
  <h5>MULTIPLE</h5>
1065
  <span class="d-amt"><sup>$</sup>199</span>
1066
- <span class="amt"><sup>$</sup>99</span>
1067
- <span class="s-amt">(Save $100)</span>
1068
  <span class="bil">Billed Annually</span>
1069
  <span class="s">3 Site License</span>
1070
  <span class="e">E-mail support</span>
@@ -1075,11 +1074,11 @@ $freepro_listing = '
1075
  </a>
1076
  </div>
1077
  <div class="pri-tb">
1078
- <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&discount=BFCM2020&download_id=24570&edd_options[price_id]=3">
1079
  <h5>WEBMASTER</h5>
1080
  <span class="d-amt"><sup>$</sup>249</span>
1081
- <span class="amt"><sup>$</sup>124</span>
1082
- <span class="s-amt">(Save $125)</span>
1083
  <span class="bil">Billed Annually</span>
1084
  <span class="s">10 Site License</span>
1085
  <span class="e">E-mail support</span>
@@ -1089,11 +1088,11 @@ $freepro_listing = '
1089
  </a>
1090
  </div>
1091
  <div class="pri-tb">
1092
- <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&discount=BFCM2020&download_id=24570&edd_options[price_id]=4">
1093
  <h5>FREELANCER</h5>
1094
  <span class="d-amt"><sup>$</sup>299</span>
1095
- <span class="amt"><sup>$</sup>149</span>
1096
- <span class="s-amt">(Save $150)</span>
1097
  <span class="bil">Billed Annually</span>
1098
  <span class="s">25 Site License</span>
1099
  <span class="e">E-mail support</span>
@@ -1103,11 +1102,11 @@ $freepro_listing = '
1103
  </a>
1104
  </div>
1105
  <div class="pri-tb">
1106
- <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&discount=BFCM2020&download_id=24570&edd_options[price_id]=5">
1107
  <h5>AGENCY</h5>
1108
  <span class="d-amt"><sup>$</sup>499</span>
1109
- <span class="amt"><sup>$</sup>249</span>
1110
- <span class="s-amt">(Save $250)</span>
1111
  <span class="bil">Billed Annually</span>
1112
  <span class="s">Unlimited</span>
1113
  <span class="e">E-mail support</span>
@@ -1397,16 +1396,11 @@ if(get_theme_support('amp-template-mode')){
1397
  $upg_to_pro_url = 'https://ampforwp.com/membership/#utm_source=options-panel&utm_medium=view_pro_features_btn&utm_campaign=AMP%20Plugin';
1398
  $upg_to_pro_target = 'target="_blank"';
1399
  }
1400
- $proDetailsProvide = '<a class="technical_support_btn_txt" href="https://ampforwp.com/support/" target="_blank">'.esc_html__('Technical Support','accelerated-mobile-pages').'</a> <a class="premium_features_btn dof" href="'.$upg_to_pro_url.'" id="ampforwp-prem-upg-to" '.$upg_to_pro_target.'>
1401
- <img class="black-friday-img" src="'.AMPFORWP_IMAGE_DIR . '/blackfriday.png" />
1402
- <span>50% OFF on Everything</span>
1403
- </a> ';
1404
  if($ampforwp_nameOfUser!=""){
1405
- $proDetailsProvide = "<span class='extension-menu-call'><span class='activated-plugins'>Hello, ".esc_html($ampforwp_nameOfUser)."</span> <a class='' href='".esc_url($amppro_settings_url)."'><i class='dashicons-before dashicons-admin-generic'></i></a></span>";
1406
  }elseif($ampforwp_is_productActivated){
1407
- $proDetailsProvide = "<span class='extension-menu-call'><a class='premium_features_btn' href='".esc_url($amppro_enter_keyurl)."'>Enter license here</a></span><a class='premium_features_btn dof' target='_blank' href='https://ampforwp.com/festive-season/' id='ampforwp-prem-upg-to'>
1408
- <img class='black-friday-img' src='".AMPFORWP_IMAGE_DIR . "/blackfriday.png' />
1409
- <span>50% OFF on Upgrades & Renewals</span></a>";
1410
  }
1411
  if(function_exists('amp_activate') ){
1412
  $proDetailsProvide = "<a class='premium_features_btn_txt' href=\"#\"> AMP by Automattic compatibility has been activated</a>";
@@ -1423,7 +1417,9 @@ if( in_array( 'administrator', $user->roles ) ) {
1423
  }elseif( in_array( 'author', $user->roles ) && in_array('author', $amp_access)){
1424
  $permissions = 'edit_posts';
1425
  }
1426
-
 
 
1427
  $args = array(
1428
  // TYPICAL -> Change these values as you need/desire
1429
  'opt_name' => 'redux_builder_amp', // This is where your data is stored in the database and also becomes your global variable name.
892
  <span class="ov"></span>
893
  </div>
894
  <div class="fp-cnt">
895
+ <h1>Upgrade to Pro</h1>
 
896
  <p>Take your AMP to the next level with more beautiful themes, great extensions and more powerful features.</p>
897
  <a class="buy" href="#upgrade">BUY NOW</a>
898
  </div>
1045
  </div>
1046
  <div class="pri-lst">
1047
  <div class="pri-tb">
1048
+ <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&download_id=24570&edd_options[price_id]=1">
1049
  <h5>PERSONAL</h5>
1050
  <span class="d-amt"><sup>$</sup>149</span>
1051
+ <span class="amt"><sup>$</sup>149</span>
1052
+ <span class="s-amt">(Save $59)</span>
1053
  <span class="bil">Billed Annually</span>
1054
  <span class="s">1 Site License</span>
1055
  <span class="e">E-mail support</span>
1059
  </a>
1060
  </div>
1061
  <div class="pri-tb rec">
1062
+ <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&download_id=24570&edd_options[price_id]=2">
1063
  <h5>MULTIPLE</h5>
1064
  <span class="d-amt"><sup>$</sup>199</span>
1065
+ <span class="amt"><sup>$</sup>199</span>
1066
+ <span class="s-amt">(Save $79)</span>
1067
  <span class="bil">Billed Annually</span>
1068
  <span class="s">3 Site License</span>
1069
  <span class="e">E-mail support</span>
1074
  </a>
1075
  </div>
1076
  <div class="pri-tb">
1077
+ <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&download_id=24570&edd_options[price_id]=3">
1078
  <h5>WEBMASTER</h5>
1079
  <span class="d-amt"><sup>$</sup>249</span>
1080
+ <span class="amt"><sup>$</sup>249</span>
1081
+ <span class="s-amt">(Save $99)</span>
1082
  <span class="bil">Billed Annually</span>
1083
  <span class="s">10 Site License</span>
1084
  <span class="e">E-mail support</span>
1088
  </a>
1089
  </div>
1090
  <div class="pri-tb">
1091
+ <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&download_id=24570&edd_options[price_id]=4">
1092
  <h5>FREELANCER</h5>
1093
  <span class="d-amt"><sup>$</sup>299</span>
1094
+ <span class="amt"><sup>$</sup>299</span>
1095
+ <span class="s-amt">(Save $119)</span>
1096
  <span class="bil">Billed Annually</span>
1097
  <span class="s">25 Site License</span>
1098
  <span class="e">E-mail support</span>
1102
  </a>
1103
  </div>
1104
  <div class="pri-tb">
1105
+ <a href="https://accounts.ampforwp.com/order?edd_action=add_to_cart&download_id=24570&edd_options[price_id]=5">
1106
  <h5>AGENCY</h5>
1107
  <span class="d-amt"><sup>$</sup>499</span>
1108
+ <span class="amt"><sup>$</sup>499</span>
1109
+ <span class="s-amt">(Save $199)</span>
1110
  <span class="bil">Billed Annually</span>
1111
  <span class="s">Unlimited</span>
1112
  <span class="e">E-mail support</span>
1396
  $upg_to_pro_url = 'https://ampforwp.com/membership/#utm_source=options-panel&utm_medium=view_pro_features_btn&utm_campaign=AMP%20Plugin';
1397
  $upg_to_pro_target = 'target="_blank"';
1398
  }
1399
+ $proDetailsProvide = '<a class="technical_support_btn_txt" href="https://ampforwp.com/support/" target="_blank">'.esc_html__('Technical Support','accelerated-mobile-pages').'</a> <a class="premium_features_btn" href="https://ampforwp.com/membership/#utm_source=options-panel&utm_medium=view_pro_features_btn&utm_campaign=AMP%20Plugin" target="_blank">Upgrade to PRO</a> ';
 
 
 
1400
  if($ampforwp_nameOfUser!=""){
1401
+ $proDetailsProvide = "<span class='extension-menu-call'><span class='activated-plugins'>Hello, ".esc_html($ampforwp_nameOfUser)."</span> <a class='' href='".esc_url(admin_url('admin.php?page=amp_options&tabid=opt-go-premium'))."'><i class='dashicons-before dashicons-admin-generic'></i></a></span>";
1402
  }elseif($ampforwp_is_productActivated){
1403
+ $proDetailsProvide = "<span class='extension-menu-call'>One more Step <a class='premium_features_btn' href='".esc_url(admin_url('admin.php?tabid=opt-go-premium&page=amp_options'))."'>Enter license here</a></span>";
 
 
1404
  }
1405
  if(function_exists('amp_activate') ){
1406
  $proDetailsProvide = "<a class='premium_features_btn_txt' href=\"#\"> AMP by Automattic compatibility has been activated</a>";
1417
  }elseif( in_array( 'author', $user->roles ) && in_array('author', $amp_access)){
1418
  $permissions = 'edit_posts';
1419
  }
1420
+ if (class_exists('WPSEO_Options') && in_array( 'wpseo_manager', $user->roles ) && in_array('wpseo_manager', $amp_access)) {
1421
+ $permissions = 'edit_pages';
1422
+ }
1423
  $args = array(
1424
  // TYPICAL -> Change these values as you need/desire
1425
  'opt_name' => 'redux_builder_amp', // This is where your data is stored in the database and also becomes your global variable name.
includes/options/redux-core/assets/css/redux-admin.css CHANGED
@@ -976,7 +976,7 @@ background: linear-gradient(45deg, #E47B49 0%, #ea4c89 100%);
976
  color: #666;
977
  font-weight: 500;
978
  margin-bottom: 15px;
979
- display: block;
980
  text-decoration: line-through;
981
  }
982
  .d-amt sup{
976
  color: #666;
977
  font-weight: 500;
978
  margin-bottom: 15px;
979
+ display: none;
980
  text-decoration: line-through;
981
  }
982
  .d-amt sup{
includes/redirect.php CHANGED
@@ -164,7 +164,7 @@ if(is_search() && 0 == ampforwp_get_setting('amp-redirection-search')){
164
  }
165
 
166
  // Frontpage
167
- if ( is_front_page() && $current_location == $home_url ) {
168
  return;
169
  }
170
 
@@ -215,7 +215,7 @@ if(is_search() && 0 == ampforwp_get_setting('amp-redirection-search')){
215
  }
216
  $ampforwp_amp_post_on_off_meta = "";
217
  $ampforwp_amp_post_on_off_meta = get_post_meta( ampforwp_get_the_ID(),'ampforwp-amp-on-off',true);
218
- if(false == $ampforwp_amp_post_on_off_meta){
219
  return;
220
  }
221
  /* Fallback, if for any reason, $redirection_location is still NULL
164
  }
165
 
166
  // Frontpage
167
+ if ( is_front_page() && $current_location == $home_url && ampforwp_is_front_page()) {
168
  return;
169
  }
170
 
215
  }
216
  $ampforwp_amp_post_on_off_meta = "";
217
  $ampforwp_amp_post_on_off_meta = get_post_meta( ampforwp_get_the_ID(),'ampforwp-amp-on-off',true);
218
+ if(false == $ampforwp_amp_post_on_off_meta && !ampforwp_is_home()){
219
  return;
220
  }
221
  /* Fallback, if for any reason, $redirection_location is still NULL
includes/vendor/amp/includes/amp-post-template-actions.php CHANGED
@@ -23,6 +23,9 @@ if( (class_exists('Yoast\\WP\\SEO\\Integrations\\Front_End_Integration')) ){
23
  add_action( 'amp_post_template_head', 'AMPforWP\\AMPVendor\\amp_post_template_add_title' );
24
  }
25
  function amp_post_template_add_canonical( $amp_template ) {
 
 
 
26
  ?>
27
  <link rel="canonical" href="<?php echo esc_url( apply_filters('ampforwp_modify_rel_url',$amp_template->get( 'canonical_url' ) ) ); ?>" />
28
  <?php
23
  add_action( 'amp_post_template_head', 'AMPforWP\\AMPVendor\\amp_post_template_add_title' );
24
  }
25
  function amp_post_template_add_canonical( $amp_template ) {
26
+ if (function_exists('aioseo_pro_just_activated')) {
27
+ return;
28
+ }
29
  ?>
30
  <link rel="canonical" href="<?php echo esc_url( apply_filters('ampforwp_modify_rel_url',$amp_template->get( 'canonical_url' ) ) ); ?>" />
31
  <?php
pagebuilder/inc/viewShowFrontData.php CHANGED
@@ -426,8 +426,9 @@ function amp_pagebuilder_content_styles(){
426
  if(!isset($moduleTemplate[$contentArray['type']]['repeater']['front_css'])){
427
  continue;
428
  }
429
-
430
  if($moduleField['content_type']=='css'){
 
431
  $repeaterFrontCss = str_replace('{{repeater-module-class}}', $moduleField['name'].'_'.$repeaterVarIndex, $repeaterFrontCss);
432
  $replace = $repeaterUserValues[$moduleField['name'].'_'.$repeaterVarIndex];
433
  if(is_array($replace)){
@@ -522,9 +523,12 @@ function ampforwp_pb_autoCompileLess($css)
522
  $medias = array();
523
  foreach ($completeCssMinifies as $key => $value) {
524
  preg_match_all('!\d+!', $key, $matches);
525
- if($matches){
526
  $medias[$matches[0][0]] = $value;
527
  }
 
 
 
528
  }
529
  krsort($medias);
530
  foreach ($medias as $id => $val)
426
  if(!isset($moduleTemplate[$contentArray['type']]['repeater']['front_css'])){
427
  continue;
428
  }
429
+ $repeaterFrontCss = $moduleTemplate[$contentArray['type']]['repeater']['front_css'];
430
  if($moduleField['content_type']=='css'){
431
+ $repeaterFrontCss = str_replace("{{module-class}}", '.ap_m_'.$contentArray['cell_id'], $repeaterFrontCss );
432
  $repeaterFrontCss = str_replace('{{repeater-module-class}}', $moduleField['name'].'_'.$repeaterVarIndex, $repeaterFrontCss);
433
  $replace = $repeaterUserValues[$moduleField['name'].'_'.$repeaterVarIndex];
434
  if(is_array($replace)){
523
  $medias = array();
524
  foreach ($completeCssMinifies as $key => $value) {
525
  preg_match_all('!\d+!', $key, $matches);
526
+ if($matches && !isset($medias[$matches[0][0]])){
527
  $medias[$matches[0][0]] = $value;
528
  }
529
+ if($matches && isset($medias[$matches[0][0]])){
530
+ $medias[$matches[0][0]] .= $value;
531
+ }
532
  }
533
  krsort($medias);
534
  foreach ($medias as $id => $val)
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.6
7
- Stable tag: 1.0.69.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -190,48 +190,27 @@ You can contact us from [here](https://ampforwp.com/contact/)
190
 
191
  == Changelog ==
192
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
193
  = 1.0.69.2 (27th November 2020) =
194
  * Fixed: Improvements in offer banner #4833
195
 
196
  = 1.0.69.1 (25th November 2020) =
197
  * Fixed: amp-story-player was found on this page, but is unused. #4839
198
 
199
- = 1.0.69 (25th November 2020) =
200
- * Fixed: Wrong tooltip link in the infinite scroll #4823
201
- * Fixed: Images are not showing in the AMP due to SG Optimizer lazy load #4815
202
- * Fixed: Embeds not working in AMP Takeover mode #4819
203
- * Fixed: AMPHTML appearing in archive page of Google web stories #4820
204
- * Fixed: AMP option panel page is blank with ECPay Payment for WooCommerce plugin #4816
205
- * Fixed: 404 errors on pagination urls #4373
206
- * Fixed: Blank lines not appearing between paragraphs #4818
207
- * Fixed: amp-story-player preload is being added when not using #4828
208
-
209
- = 1.0.68.1 (10th November 2020) =
210
- * Fixed: Missing amphtml on product pages #4822
211
- * Fixed: Debug warnings #4821
212
-
213
- = 1.0.68 (9th November 2020) =
214
- * Fixed: Validation error occurs when input type image is added #4785
215
- * Fixed: Featured images are not showing when "Enable lazy load images" option is enabled in the "DEUS" Theme #4710
216
- * Fixed: AMP Push Notification - Dropdown issue #4812
217
- * Fixed: Italic style caption of gallery #4806
218
- * Fixed: The canonical links are not generating for the coupon store when YOAST Plugin is active with AMPFORWP #4811
219
- * Fixed: Content not displayed in AMP post/pages with plain permalink #4814
220
- * Fixed: Tables created with 2 columns displaying 1 extra column on mobile view #4765
221
- * Fixed: Content appearing in excerpt on single post #4798
222
- * Fixed: Code improvment for amp pagebuilder's category-module #4660
223
-
224
- = 1.0.67 (4th November 2020) =
225
- * Improvement: Optimize Pagespeed score by implimenting AMP video lightbox #4531
226
- * Improvement: Added Paid Memberships PRO for AMP Extension #4737
227
- * Improvement: Added help section for the users in Options panel #4683
228
- * Improvement: Added code improvement in Tag base remover and category base remover #4664
229
- * Improvement: Added UberMenu 3 Compatiblity #4732
230
- * Improvement: Added filter to overwrite the scripts #4642
231
- * Fixed: Style amp-custom unterminated comment Error on AMP #4792
232
- * Fixed: Proper styling of Header right side icons in Design 2 #3935
233
- * Fixed: Revolution Slider not working in AMP #4669
234
- * Fixed: Additional characters at the end of footer text in Design Two #4805
235
- * Fixed: Related thumbnail image title is getting break and leading to the validation error #4804
236
-
237
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.6
7
+ Stable tag: 1.0.70
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
190
 
191
  == Changelog ==
192
 
193
+ = 1.0.70 (7th December 2020) =
194
+ * Improvement: Added filter to modify author bio description #4849
195
+ * Improvement: Added LGDP (Brazil's GDPR) #4854
196
+ * Fixed: Ads are displaying even GDPR popup is rejected #4843
197
+ * Fixed: Role Based Access not working for SEO manager role in Yoast #4830
198
+ * Fixed: Homepage url not redirecting to non-amp url with AMP takeover and ?amp #4826
199
+ * Fixed: The amphtml not generating with the Hide By Default option in AMP Takeover #4824
200
+ * Fixed: Undefined variable: allscripts #4846
201
+ * Fixed: Breadcrumb bug in amp homepage #4827
202
+ * Fixed: When the minify option is disabled then the WhatsApp share link has a space #4848
203
+ * Fixed: Validation error when using web stories plugin #4847
204
+ * Fixed: The background color of feature module of layout2 is not getting applied #4835
205
+ * Fixed: Canonical and meta description errors in All in one SEO PRO #4829
206
+ * Fixed: Avatar image doesn't have alt attribute #4836
207
+ * Fixed: AMP posts are redirecting to the 404 page when post id is added in permalink #4842
208
+ * Fixed: The amphtml not generating on the custom taxonomy and the custom post types #4841
209
+
210
  = 1.0.69.2 (27th November 2020) =
211
  * Fixed: Improvements in offer banner #4833
212
 
213
  = 1.0.69.1 (25th November 2020) =
214
  * Fixed: amp-story-player was found on this page, but is unused. #4839
215
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
216
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
templates/design-manager/design-1/elements/social-icons.php CHANGED
@@ -80,7 +80,7 @@ if(true == ampforwp_get_setting('ampforwp-social-share')){ ?>
80
  <amp-social-share type="linkedin" aria-label="linkedin" width="50" height="28" <?php ampforwp_rel_attributes_social_links(); ?>></amp-social-share>
81
  <?php } ?>
82
  <?php if($redux_builder_amp['enable-single-whatsapp-share'] == true) { ?>
83
- <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."\n".esc_url($amp_permalink); ?>" aria-label="whatsapp share">
84
  <div class="a-so-i">
85
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="50" height="20" />
86
  </div>
80
  <amp-social-share type="linkedin" aria-label="linkedin" width="50" height="28" <?php ampforwp_rel_attributes_social_links(); ?>></amp-social-share>
81
  <?php } ?>
82
  <?php if($redux_builder_amp['enable-single-whatsapp-share'] == true) { ?>
83
+ <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."&nbsp;".esc_url($amp_permalink); ?>" aria-label="whatsapp share">
84
  <div class="a-so-i">
85
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="50" height="20" />
86
  </div>
templates/design-manager/design-2/elements/social-icons.php CHANGED
@@ -80,7 +80,7 @@ if(true == ampforwp_get_setting('ampforwp-social-share')){ ?>
80
  <amp-social-share type="linkedin" width="50" height="28" <?php ampforwp_rel_attributes_social_links(); ?>></amp-social-share>
81
  <?php } ?>
82
  <?php if($redux_builder_amp['enable-single-whatsapp-share'] == true) { ?>
83
- <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."\n".esc_url($amp_permalink); ?>" aria-label="whatsapp share">
84
  <div class="a-so-i">
85
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="50" height="20" />
86
  </div>
80
  <amp-social-share type="linkedin" width="50" height="28" <?php ampforwp_rel_attributes_social_links(); ?>></amp-social-share>
81
  <?php } ?>
82
  <?php if($redux_builder_amp['enable-single-whatsapp-share'] == true) { ?>
83
+ <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."&nbsp;".esc_url($amp_permalink); ?>" aria-label="whatsapp share">
84
  <div class="a-so-i">
85
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="50" height="20" />
86
  </div>
templates/design-manager/design-3/elements/social-icons.php CHANGED
@@ -101,7 +101,7 @@ if(true == ampforwp_get_setting('ampforwp-social-share') && false == ampforwp_ge
101
  <?php } ?>
102
  <?php if ( true == $redux_builder_amp['enable-single-whatsapp-share'] ) { ?>
103
  <div class="ampforwp-custom-social">
104
- <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."\n".esc_url($amp_permalink);?>" class="a-so-i-rounded a-so-whatsapp" aria-label="whatsapp share">
105
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="16" height="16" />
106
  </a>
107
  </div>
101
  <?php } ?>
102
  <?php if ( true == $redux_builder_amp['enable-single-whatsapp-share'] ) { ?>
103
  <div class="ampforwp-custom-social">
104
+ <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."&nbsp;".esc_url($amp_permalink);?>" class="a-so-i-rounded a-so-whatsapp" aria-label="whatsapp share">
105
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="16" height="16" />
106
  </a>
107
  </div>
templates/design-manager/swift/footer.php CHANGED
@@ -190,7 +190,7 @@ if( (is_single() && $redux_builder_amp['enable-single-social-icons']) || (is_pag
190
  }
191
  ?>
192
  <li>
193
- <a title="whatsapp share" class="s_wp" target="_blank" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."\n".esc_url($amp_permalink); ?>" data-action="share/whatsapp/share"><?php echo $whatsapp_icon; ?></a>
194
  </li>
195
  <?php } ?>
196
  <?php if(ampforwp_get_setting('enable-single-line-share') == true){
190
  }
191
  ?>
192
  <li>
193
+ <a title="whatsapp share" class="s_wp" target="_blank" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."&nbsp;".esc_url($amp_permalink); ?>" data-action="share/whatsapp/share"><?php echo $whatsapp_icon; ?></a>
194
  </li>
195
  <?php } ?>
196
  <?php if(ampforwp_get_setting('enable-single-line-share') == true){
templates/design-manager/swift/functions.php CHANGED
@@ -181,7 +181,7 @@ function ampforwp_swift_social_icons(){
181
 
182
  ?>
183
  <li>
184
- <a class="s_wp" target="_blank" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."\n".esc_url($amp_permalink); ?>" data-action="share/whatsapp/share" aria-label="whatsapp share"><?php echo $whatsapp_icon; ?></a>
185
  </li>
186
  <?php } ?>
187
  <?php if(ampforwp_get_setting('enable-single-line-share') == true) {
181
 
182
  ?>
183
  <li>
184
+ <a class="s_wp" target="_blank" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."&nbsp;".esc_url($amp_permalink); ?>" data-action="share/whatsapp/share" aria-label="whatsapp share"><?php echo $whatsapp_icon; ?></a>
185
  </li>
186
  <?php } ?>
187
  <?php if(ampforwp_get_setting('enable-single-line-share') == true) {
templates/features.php CHANGED
@@ -290,9 +290,6 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
290
  if (empty(ampforwp_get_setting('ampforwp-custom-type'))) {
291
  return;
292
  }
293
- if(is_array(ampforwp_get_setting('ampforwp-custom-type')) && $post_type != ampforwp_get_setting('ampforwp-custom-type')[0]){
294
- return;
295
- }
296
  }
297
  $page_for_posts = intval(get_option( 'page_for_posts' ));
298
  $post_id = ampforwp_get_the_ID();
@@ -317,6 +314,9 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
317
  $current_archive_url = home_url( 'index.php/' . $wp->request );
318
  }
319
  $amp_url = trailingslashit($current_archive_url);
 
 
 
320
  } else {
321
  $amp_url = AMPforWP\AMPVendor\amp_get_permalink( get_queried_object_id() );
322
  }
@@ -374,8 +374,9 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
374
  $current_search_url =trailingslashit(get_home_url()) . $wp->request .'/'."?amp=1&s=".get_search_query();
375
  }
376
  }
377
-
378
- $amp_url = user_trailingslashit($amp_url);
 
379
 
380
  if( is_search() ) {
381
  $current_search_url =trailingslashit(get_home_url())."?amp=1&s=".get_search_query();
@@ -1330,7 +1331,7 @@ function ampforwp_sticky_social_icons(){
1330
  <amp-social-share type="linkedin" width="50" height="28" aria-label="linkedin" <?php ampforwp_rel_attributes_social_links(); ?>></amp-social-share>
1331
  <?php } ?>
1332
  <?php if($redux_builder_amp['enable-single-whatsapp-share'] == true) { ?>
1333
- <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."\n".esc_url($amp_permalink);?>">
1334
  <div class="a-so-i">
1335
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="50" height="20" alt="whatsapp" />
1336
  </div>
@@ -3298,6 +3299,9 @@ function ampforwp_meta_description() {
3298
  if ( false == ampforwp_get_setting('ampforwp-seo-meta-desc') || ('rank_math' == ampforwp_get_setting('ampforwp-seo-selection') && is_singular() )) {
3299
  return;
3300
  }
 
 
 
3301
  $desc = ampforwp_generate_meta_desc();
3302
  if ( $desc && !class_exists('Yoast\\WP\\SEO\\Integrations\\Front_End_Integration')) {
3303
  echo '<meta name="description" content="'. esc_attr( convert_chars( stripslashes( $desc ) ) ) .'"/>';
@@ -4412,6 +4416,9 @@ function ampforwp_home_archive_canonical_setter(){
4412
  }
4413
 
4414
  function ampforwp_rel_canonical_home_archive(){
 
 
 
4415
  global $redux_builder_amp;
4416
  global $wp;
4417
  $current_archive_url = '';
@@ -7214,10 +7221,13 @@ function ampforwp_embedly_sanitizer( $sanitizer_classes ) {
7214
  add_filter('ampforwp_is_amp_endpoint_takeover', "ampforwp_bulktool_takeover");
7215
  if (! function_exists('ampforwp_bulktool_takeover') ) {
7216
  function ampforwp_bulktool_takeover($data){
7217
- $bulk_option = ampforwp_get_setting('amp-pages-meta-default');
7218
- if(is_page() && $bulk_option == "hide" && ( true == ampforwp_get_setting('ampforwp-amp-takeover') || true == ampforwp_get_setting('ampforwp-amp-convert-to-wp'))){
7219
- remove_action( 'wp_head', 'ampforwp_home_archive_rel_canonical', 1 );
7220
- return false;
 
 
 
7221
  }
7222
  return $data;
7223
  }
@@ -8319,6 +8329,7 @@ function ampforwp_remove_unwanted_code($content){
8319
  }
8320
  add_filter('ampforwp_the_content_last_filter','ampforwp_include_required_scripts',12);
8321
  function ampforwp_include_required_scripts($content){
 
8322
  $comp_to_remove_arr = array();
8323
  preg_match_all('/<\/amp-(.*?)>/', $content, $matches);
8324
  if(isset($matches[1][0])){
@@ -9062,7 +9073,7 @@ add_filter('ampforwp_post_template_data','ampforwp_amp_story_player_script',12);
9062
  function ampforwp_amp_story_player_script($data) {
9063
  if ( isset($data['post'])) {
9064
  $post_content = $data['post']->post_content;
9065
- if ( preg_match('/<amp-story-player(.*?)<\/amp-story-player>/s', $post_content ) && empty( $data['amp_component_scripts']['amp-story-player'] ) ) {
9066
  $data['amp_component_scripts']['amp-story-player'] = 'https://cdn.ampproject.org/v0/amp-story-player-latest.js';
9067
  }
9068
  }
@@ -9117,50 +9128,28 @@ function ampforwp_video_lightbox_css(){
9117
  .amp-video-img{max-width:600px;position:relative}
9118
  .amp-video-play-on-image{cursor:pointer;margin:auto;width:56px;height:56px;-webkit-border-radius:50%;border-radius:50%;background-color:rgba(0,0,0,.2);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAY1BMVEVHcEz///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////80LMUcAAAAIHRSTlMA1d4MSXeg9glf6yEq4hfnnr7Z8qm5U/3Jm1pwFJcmBYTgJ9QAAAIjSURBVGje7VnJdoMwDFSMHVMSQljCklX//5U99NQHGEm22gtz9tPAWNYKsGPHDiou1h3rpvDD4Iumvjp7SWg86yeDM5ipz5KYt53HFfjORn+8KzEI88iizLe4icLlUvtfFZJQ3kXmTzWScTsJPr9FBtovpvn8iExMrJu4jMjGyHh67xIFMOSLOFcoQnUmfr/QPmL1JulfohiGcA/5iBEYt33piFG4br4vjMTGizu1sQRt2FlrjMZNVSBExEBszaoUBOW6JzlMArf6A0XIOzyZoMgkPwDnA5nhsWz/E4wRnBxhVuoTDBMAkGVarma6TQKyTN3iFfttAqJMg1/y1B4JBFSZ+gWCiUZAk+m1QGCIBCSZmoVEhlQCkkxPppP+JiDIZNlxiFmYOXaqnEX2sEwTO9XMq6egTPXsfMMlCMt0mB0v2ARBmYrZYS8gCMjkZ2cHCcG6TMPfE6hLpH7J6m6a+KHN67urdqhQD3bq4Vo94ainTP2kn7RssbqFF7a5buk4dP9T/Ib9KEH5Dg/lBkS/hVJvAiEvU9gPtLFwT0HQh1r9m/IoQX8YEj+t2JwCX+PsT7ojtWH8EIaCJmIo+FQeaxJHs9LBbPkGIt4ilQxjxi8ajj+BgZztra8P8MBcUAi2LCdGXJKsWADgTozeppeuoXJXEPKXfM0FANnDaC7qtlaNbfyq8Uep/rXQYDUvm0M6XKyb6sPPuvdwm5x9wo4dO6j4BoilN6H4pmTiAAAAAElFTkSuQmCC);background-position:center;-webkit-background-size:48px 48px;background-size:48px 48px;position:absolute;top:0;bottom:0;left:0;right:0}';
9119
  }
9120
- function ampforwp_admin_discount_btn() {
9121
- if(! current_user_can( 'manage_options' )) {
9122
- return ;
9123
- }
9124
- $screen = get_current_screen();
9125
- $result = get_option( "ampforwp_dismiss_discount_btn");
9126
- $date_now = new DateTime();
9127
- $date_exp = new DateTime("02/12/2020");
9128
- if ($result != 'removed' && ($date_now > $date_exp) && ('toplevel_page_amp_options' == $screen->base )) {
9129
- $date = date('d-m-y');
9130
- if ($date == '01-12-20') {
9131
- $msg = 'Only 24 Hours Remaining';
9132
- $img = AMPFORWP_IMAGE_DIR . '/last-chance.png';
9133
- $class_img = 'offer-img-24';
9134
- $class_text = 'offer-text-bm-24';
9135
- }else{
9136
- $msg = 'Black Friday &amp; Cyber Monday';
9137
- $img = AMPFORWP_IMAGE_DIR . '/bf-offer.png';
9138
- $class_img = 'offer-img';
9139
- $class_text = 'offer-text-bm';
9140
  }
9141
- $href = admin_url('admin.php?page=amp_options&tab=31');
9142
- if (ampforwp_check_extensions()) {
9143
- $href = 'https://ampforwp.com/festive-season/';
 
 
 
 
 
 
 
 
9144
  }
9145
- ?>
9146
- <div class="wrapper-discount">
9147
- <a class="admin_discount_btn" target="_blank" href="<?php echo esc_url_raw($href) ?>">
9148
- <img src="<?php echo esc_url($img) ?>" class="<?php echo esc_attr($class_img) ?>" >
9149
- <span class="offer-text-top" ><?php echo esc_html($msg) ?></span><br><span class="<?php echo esc_html($class_text) ?>">50% OFF on AMPforWP</span></a>
9150
- <span id='amp-close'>x</span></div>
9151
- <?php } }
9152
- add_action('admin_footer', 'ampforwp_admin_discount_btn');
9153
-
9154
- function ampforwp_dismiss_discount_btn(){
9155
- if(! current_user_can( 'manage_options' )) {
9156
- return ;
9157
- }
9158
- $result = update_option( "ampforwp_dismiss_discount_btn", 'removed');
9159
- if($result){
9160
- echo json_encode(array('status'=>'t'));
9161
- }else{
9162
- echo json_encode(array('status'=>'f'));
9163
- }
9164
- wp_die();
9165
- }
9166
- add_action('wp_ajax_ampforwp_dismiss_discount_btn', 'ampforwp_dismiss_discount_btn');
290
  if (empty(ampforwp_get_setting('ampforwp-custom-type'))) {
291
  return;
292
  }
 
 
 
293
  }
294
  $page_for_posts = intval(get_option( 'page_for_posts' ));
295
  $post_id = ampforwp_get_the_ID();
314
  $current_archive_url = home_url( 'index.php/' . $wp->request );
315
  }
316
  $amp_url = trailingslashit($current_archive_url);
317
+ if ($endpoint_check && !is_category() && !is_tag()) {
318
+ $amp_url = ampforwp_url_controller($amp_url);
319
+ }
320
  } else {
321
  $amp_url = AMPforWP\AMPVendor\amp_get_permalink( get_queried_object_id() );
322
  }
374
  $current_search_url =trailingslashit(get_home_url()) . $wp->request .'/'."?amp=1&s=".get_search_query();
375
  }
376
  }
377
+ if (!$endpoint_check) {
378
+ $amp_url = user_trailingslashit($amp_url);
379
+ }
380
 
381
  if( is_search() ) {
382
  $current_search_url =trailingslashit(get_home_url())."?amp=1&s=".get_search_query();
1331
  <amp-social-share type="linkedin" width="50" height="28" aria-label="linkedin" <?php ampforwp_rel_attributes_social_links(); ?>></amp-social-share>
1332
  <?php } ?>
1333
  <?php if($redux_builder_amp['enable-single-whatsapp-share'] == true) { ?>
1334
+ <a title="whatsapp share" <?php ampforwp_rel_attributes_social_links(); ?> href="https://api.whatsapp.com/send?text=<?php echo esc_attr(htmlspecialchars(get_the_title()))."&nbsp;".esc_url($amp_permalink);?>">
1335
  <div class="a-so-i">
1336
  <amp-img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjUxMnB4IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgOTAgOTAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDkwIDkwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPHBhdGggaWQ9IldoYXRzQXBwIiBkPSJNOTAsNDMuODQxYzAsMjQuMjEzLTE5Ljc3OSw0My44NDEtNDQuMTgyLDQzLjg0MWMtNy43NDcsMC0xNS4wMjUtMS45OC0yMS4zNTctNS40NTVMMCw5MGw3Ljk3NS0yMy41MjIgICBjLTQuMDIzLTYuNjA2LTYuMzQtMTQuMzU0LTYuMzQtMjIuNjM3QzEuNjM1LDE5LjYyOCwyMS40MTYsMCw0NS44MTgsMEM3MC4yMjMsMCw5MCwxOS42MjgsOTAsNDMuODQxeiBNNDUuODE4LDYuOTgyICAgYy0yMC40ODQsMC0zNy4xNDYsMTYuNTM1LTM3LjE0NiwzNi44NTljMCw4LjA2NSwyLjYyOSwxNS41MzQsNy4wNzYsMjEuNjFMMTEuMTA3LDc5LjE0bDE0LjI3NS00LjUzNyAgIGM1Ljg2NSwzLjg1MSwxMi44OTEsNi4wOTcsMjAuNDM3LDYuMDk3YzIwLjQ4MSwwLDM3LjE0Ni0xNi41MzMsMzcuMTQ2LTM2Ljg1N1M2Ni4zMDEsNi45ODIsNDUuODE4LDYuOTgyeiBNNjguMTI5LDUzLjkzOCAgIGMtMC4yNzMtMC40NDctMC45OTQtMC43MTctMi4wNzYtMS4yNTRjLTEuMDg0LTAuNTM3LTYuNDEtMy4xMzgtNy40LTMuNDk1Yy0wLjk5My0wLjM1OC0xLjcxNy0wLjUzOC0yLjQzOCwwLjUzNyAgIGMtMC43MjEsMS4wNzYtMi43OTcsMy40OTUtMy40Myw0LjIxMmMtMC42MzIsMC43MTktMS4yNjMsMC44MDktMi4zNDcsMC4yNzFjLTEuMDgyLTAuNTM3LTQuNTcxLTEuNjczLTguNzA4LTUuMzMzICAgYy0zLjIxOS0yLjg0OC01LjM5My02LjM2NC02LjAyNS03LjQ0MWMtMC42MzEtMS4wNzUtMC4wNjYtMS42NTYsMC40NzUtMi4xOTFjMC40ODgtMC40ODIsMS4wODQtMS4yNTUsMS42MjUtMS44ODIgICBjMC41NDMtMC42MjgsMC43MjMtMS4wNzUsMS4wODItMS43OTNjMC4zNjMtMC43MTcsMC4xODItMS4zNDQtMC4wOS0xLjg4M2MtMC4yNy0wLjUzNy0yLjQzOC01LjgyNS0zLjM0LTcuOTc3ICAgYy0wLjkwMi0yLjE1LTEuODAzLTEuNzkyLTIuNDM2LTEuNzkyYy0wLjYzMSwwLTEuMzU0LTAuMDktMi4wNzYtMC4wOWMtMC43MjIsMC0xLjg5NiwwLjI2OS0yLjg4OSwxLjM0NCAgIGMtMC45OTIsMS4wNzYtMy43ODksMy42NzYtMy43ODksOC45NjNjMCw1LjI4OCwzLjg3OSwxMC4zOTcsNC40MjIsMTEuMTEzYzAuNTQxLDAuNzE2LDcuNDksMTEuOTIsMTguNSwxNi4yMjMgICBDNTguMiw2NS43NzEsNTguMiw2NC4zMzYsNjAuMTg2LDY0LjE1NmMxLjk4NC0wLjE3OSw2LjQwNi0yLjU5OSw3LjMxMi01LjEwN0M2OC4zOTgsNTYuNTM3LDY4LjM5OCw1NC4zODYsNjguMTI5LDUzLjkzOHoiIGZpbGw9IiNGRkZGRkYiLz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" width="50" height="20" alt="whatsapp" />
1337
  </div>
3299
  if ( false == ampforwp_get_setting('ampforwp-seo-meta-desc') || ('rank_math' == ampforwp_get_setting('ampforwp-seo-selection') && is_singular() )) {
3300
  return;
3301
  }
3302
+ if (function_exists('aioseo_pro_just_activated') && 'aioseo' == ampforwp_get_setting('ampforwp-seo-selection') ) {
3303
+ return;
3304
+ }
3305
  $desc = ampforwp_generate_meta_desc();
3306
  if ( $desc && !class_exists('Yoast\\WP\\SEO\\Integrations\\Front_End_Integration')) {
3307
  echo '<meta name="description" content="'. esc_attr( convert_chars( stripslashes( $desc ) ) ) .'"/>';
4416
  }
4417
 
4418
  function ampforwp_rel_canonical_home_archive(){
4419
+ if (function_exists('aioseo_pro_just_activated')) {
4420
+ return;
4421
+ }
4422
  global $redux_builder_amp;
4423
  global $wp;
4424
  $current_archive_url = '';
7221
  add_filter('ampforwp_is_amp_endpoint_takeover', "ampforwp_bulktool_takeover");
7222
  if (! function_exists('ampforwp_bulktool_takeover') ) {
7223
  function ampforwp_bulktool_takeover($data){
7224
+ if ( true == ampforwp_get_setting('ampforwp-amp-takeover') || true == ampforwp_get_setting('ampforwp-amp-convert-to-wp')) {
7225
+ $bulk_option = ampforwp_get_setting('amp-pages-meta-default');
7226
+ $ampforwp_stored_meta = get_post_meta( ampforwp_get_the_ID(),'ampforwp-amp-on-off',true);
7227
+ if(is_page() && $bulk_option == "hide" && !isset($ampforwp_stored_meta)){
7228
+ remove_action( 'wp_head', 'ampforwp_home_archive_rel_canonical', 1 );
7229
+ return false;
7230
+ }
7231
  }
7232
  return $data;
7233
  }
8329
  }
8330
  add_filter('ampforwp_the_content_last_filter','ampforwp_include_required_scripts',12);
8331
  function ampforwp_include_required_scripts($content){
8332
+ $allscripts = '';
8333
  $comp_to_remove_arr = array();
8334
  preg_match_all('/<\/amp-(.*?)>/', $content, $matches);
8335
  if(isset($matches[1][0])){
9073
  function ampforwp_amp_story_player_script($data) {
9074
  if ( isset($data['post'])) {
9075
  $post_content = $data['post']->post_content;
9076
+ if ( (preg_match('/<amp-story-player(.*?)<\/amp-story-player>/s', $post_content) || preg_match('/web-stories/', $post_content )) && empty( $data['amp_component_scripts']['amp-story-player'] ) ) {
9077
  $data['amp_component_scripts']['amp-story-player'] = 'https://cdn.ampproject.org/v0/amp-story-player-latest.js';
9078
  }
9079
  }
9128
  .amp-video-img{max-width:600px;position:relative}
9129
  .amp-video-play-on-image{cursor:pointer;margin:auto;width:56px;height:56px;-webkit-border-radius:50%;border-radius:50%;background-color:rgba(0,0,0,.2);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAY1BMVEVHcEz///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////80LMUcAAAAIHRSTlMA1d4MSXeg9glf6yEq4hfnnr7Z8qm5U/3Jm1pwFJcmBYTgJ9QAAAIjSURBVGje7VnJdoMwDFSMHVMSQljCklX//5U99NQHGEm22gtz9tPAWNYKsGPHDiou1h3rpvDD4Iumvjp7SWg86yeDM5ipz5KYt53HFfjORn+8KzEI88iizLe4icLlUvtfFZJQ3kXmTzWScTsJPr9FBtovpvn8iExMrJu4jMjGyHh67xIFMOSLOFcoQnUmfr/QPmL1JulfohiGcA/5iBEYt33piFG4br4vjMTGizu1sQRt2FlrjMZNVSBExEBszaoUBOW6JzlMArf6A0XIOzyZoMgkPwDnA5nhsWz/E4wRnBxhVuoTDBMAkGVarma6TQKyTN3iFfttAqJMg1/y1B4JBFSZ+gWCiUZAk+m1QGCIBCSZmoVEhlQCkkxPppP+JiDIZNlxiFmYOXaqnEX2sEwTO9XMq6egTPXsfMMlCMt0mB0v2ARBmYrZYS8gCMjkZ2cHCcG6TMPfE6hLpH7J6m6a+KHN67urdqhQD3bq4Vo94ainTP2kn7RssbqFF7a5buk4dP9T/Ib9KEH5Dg/lBkS/hVJvAiEvU9gPtLFwT0HQh1r9m/IoQX8YEj+t2JwCX+PsT7ojtWH8EIaCJmIo+FQeaxJHs9LBbPkGIt4ilQxjxi8ajj+BgZztra8P8MBcUAi2LCdGXJKsWADgTozeppeuoXJXEPKXfM0FANnDaC7qtlaNbfyq8Uep/rXQYDUvm0M6XKyb6sPPuvdwm5x9wo4dO6j4BoilN6H4pmTiAAAAAElFTkSuQmCC);background-position:center;-webkit-background-size:48px 48px;background-size:48px 48px;position:absolute;top:0;bottom:0;left:0;right:0}';
9130
  }
9131
+
9132
+ if (class_exists('WPSEO_Options')) {
9133
+ add_filter('yoast_seo_development_mode','ampforwp_yoast_seo_development');
9134
+ add_filter('wpseo_debug_json_data','ampforwp_remove_homepage_breadcrumb');
9135
+ }
9136
+
9137
+ function ampforwp_yoast_seo_development($dev){
9138
+ $url_path = trim(parse_url(add_query_arg(array()), PHP_URL_PATH),'/' );
9139
+ if (ampforwp_get_setting('ampforwp-seo-selection') == 'yoast' && ampforwp_get_setting('ampforwp-seo-yoast-schema') && ampforwp_is_home() && function_exists('ampforwp_is_amp_inURL') && ampforwp_is_amp_inURL($url_path)) {
9140
+ $dev = true;
 
 
 
 
 
 
 
 
 
 
9141
  }
9142
+ return $dev;
9143
+ }
9144
+ function ampforwp_remove_homepage_breadcrumb($data){
9145
+ $url_path = trim(parse_url(add_query_arg(array()), PHP_URL_PATH),'/' );
9146
+ if (ampforwp_get_setting('ampforwp-seo-selection') == 'yoast' && ampforwp_get_setting('ampforwp-seo-yoast-schema') && ampforwp_is_home() && function_exists('ampforwp_is_amp_inURL') && ampforwp_is_amp_inURL($url_path)) {
9147
+ if (isset($data["@graph"][2]["breadcrumb"])) {
9148
+ unset($data["@graph"][2]["breadcrumb"]);
9149
+ }
9150
+ if ($data["@graph"][3]["@type"] == 'BreadcrumbList') {
9151
+ unset($data["@graph"][3]);
9152
+ }
9153
  }
9154
+ return $data;
9155
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
uninstall.php CHANGED
@@ -73,5 +73,6 @@ if(isset($redux_builder_amp['ampforwp-delete-on-uninstall']) && $redux_builder_a
73
  }
74
  delete_option('ampforwp_option_panel_view_type');
75
  delete_option("ampforwp_feedback_remove_notice");
 
76
  }
77
  }
73
  }
74
  delete_option('ampforwp_option_panel_view_type');
75
  delete_option("ampforwp_feedback_remove_notice");
76
+ delete_option("ampforwp_dismiss_discount_btn");
77
  }
78
  }