AMP for WP – Accelerated Mobile Pages - Version 1.0.77.39

Version Description

(5th April 2022) = * Improvements: Added New Guidelines in GDPR #5225 * Improvements: Added AT internet analytics support #5233 * Improvements: UI improved of feedback form #5223 * Fixed: Header and footer showing twice in new infine scroll #5238 * Fixed: AMP option panel not working with Tour Booking Manager plugin #5236 * Fixed: Font style not loading correctly on first page load #5224 * Fixed: The hamburger icon is not clickable when Font Icon Library is selected as CSS Icons #5243 * Fixed: Duplicate li tags removed #5241 * Fixed: Warning compatibility PHP 8.0 #5245

Download this release

Release Info

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

Code changes from version 1.0.77.38 to 1.0.77.39

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.9.1
7
- Stable tag: 1.0.77.38
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -197,6 +197,17 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
197
 
198
  == Changelog ==
199
 
 
 
 
 
 
 
 
 
 
 
 
200
  = 1.0.77.38 (7th March 2022) =
201
  * Improvements: Added The Publisher Desk Support #5213
202
  * Fixed: Displaying a blank white screen when embed URLs are used #5193
@@ -205,19 +216,4 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
205
  * Improvements: Added new infinite scrolling experience #4791
206
  * Fixed: The links in embed URLs are not clickable #5193
207
 
208
- = 1.0.77.37 (2nd March 2022) =
209
- * Improvements: Added feedback form with auto email system #5223
210
- * Improvements: Added new infinite scrolling experience #4791
211
- * Improvements: Added An option to add lang_ and privacyMode values in Quantcast #5206
212
- * Improvements: Added FireWork compatibility #5210
213
- * Fixed: AMP autocomplete tag is not working #5217
214
- * Fixed: Autoplay functionality not working in video module #5219
215
- * Fixed: Fonts loading twice in Global font family #5220
216
- * Fixed: Unable to connect to Matomo analytics #5221
217
-
218
- = 1.0.77.36 (18th February 2022) =
219
- * Fixed: If the server-side cache is aggressive then the pagination URL with ?amp=1 is redirecting to non-AMP #5208
220
- * Fixed: Errror getting in featured-image.php, on line 77 #5207
221
- * Fixed: Need to keep the mobile redirection filter outside of any condition #5216
222
-
223
  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.9.1
7
+ Stable tag: 1.0.77.39
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
197
 
198
  == Changelog ==
199
 
200
+ = 1.0.77.39 (5th April 2022) =
201
+ * Improvements: Added New Guidelines in GDPR #5225
202
+ * Improvements: Added AT internet analytics support #5233
203
+ * Improvements: UI improved of feedback form #5223
204
+ * Fixed: Header and footer showing twice in new infine scroll #5238
205
+ * Fixed: AMP option panel not working with Tour Booking Manager plugin #5236
206
+ * Fixed: Font style not loading correctly on first page load #5224
207
+ * Fixed: The hamburger icon is not clickable when Font Icon Library is selected as CSS Icons #5243
208
+ * Fixed: Duplicate li tags removed #5241
209
+ * Fixed: Warning compatibility PHP 8.0 #5245
210
+
211
  = 1.0.77.38 (7th March 2022) =
212
  * Improvements: Added The Publisher Desk Support #5213
213
  * Fixed: Displaying a blank white screen when embed URLs are used #5193
216
  * Improvements: Added new infinite scrolling experience #4791
217
  * Fixed: The links in embed URLs are not clickable #5193
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.77.38
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.77.38');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
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.77.39
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.77.39');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
changelog.txt CHANGED
@@ -1,5 +1,16 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 1.0.77.38 (7th March 2022) =
4
  * Improvements: Added The Publisher Desk Support #5213
5
  * Fixed: Displaying a blank white screen when embed URLs are used #5193
1
  == Changelog ==
2
 
3
+ = 1.0.77.39 (5th April 2022) =
4
+ * Improvements: Added New Guidelines in GDPR #5225
5
+ * Improvements: Added AT internet analytics support #5233
6
+ * Improvements: UI improved of feedback form #5223
7
+ * Fixed: Header and footer showing twice in new infine scroll #5238
8
+ * Fixed: AMP option panel not working with Tour Booking Manager plugin #5236
9
+ * Fixed: Font style not loading correctly on first page load #5224
10
+ * Fixed: The hamburger icon is not clickable when Font Icon Library is selected as CSS Icons #5243
11
+ * Fixed: Duplicate li tags removed #5241
12
+ * Fixed: Warning compatibility PHP 8.0 #5245
13
+
14
  = 1.0.77.38 (7th March 2022) =
15
  * Improvements: Added The Publisher Desk Support #5213
16
  * Fixed: Displaying a blank white screen when embed URLs are used #5193
components/comments/comments.php CHANGED
@@ -86,7 +86,6 @@ function ampforwp_framework_get_comments(){
86
  </div>
87
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
88
  </article>
89
- </li>
90
  <?php
91
  }
92
  wp_list_comments( array(
86
  </div>
87
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
88
  </article>
 
89
  <?php
90
  }
91
  wp_list_comments( array(
components/gdpr/gdpr.php CHANGED
@@ -59,6 +59,23 @@ function amp_gdpr_output(){
59
  <div class="gdpr_t">
60
  <h3><?php echo esc_html__($headline,'accelerated-mobile-pages'); ?></h3>
61
  <p><?php echo esc_html__($user_data,'accelerated-mobile-pages'); ?></p>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
62
  </div><?php if(isset($redux_builder_amp['amp-gdpr-compliance-select-privacy-page']) && $redux_builder_amp['amp-gdpr-compliance-select-privacy-page']){?>
63
  <div class="gdpr_fmi">
64
  <span><?php echo esc_html__($more_info,'accelerated-mobile-pages'); ?></span>
59
  <div class="gdpr_t">
60
  <h3><?php echo esc_html__($headline,'accelerated-mobile-pages'); ?></h3>
61
  <p><?php echo esc_html__($user_data,'accelerated-mobile-pages'); ?></p>
62
+ <?php if (ampforwp_get_setting('amp-gdpr-newguidelines-switch')) { ?>
63
+ <p>You can control the ways in which we improve and personalize your experience. Please choose whether you wish to allow the following:</p>
64
+ <div class="choices">
65
+ <label class="consentLabel" for="consent-purpose-marketing">
66
+ <input id="consent-purpose-marketing" type="checkbox" on="change:siteConsent.setPurpose(purpose-marketing=event.checked)">
67
+ Marketing cookies
68
+ </label>
69
+ <label class="consentLabel" for="consent-purpose-conversion">
70
+ <input id="consent-purpose-conversion" type="checkbox" on="change:siteConsent.setPurpose(purpose-conversion=event.checked)">
71
+ Conversion tracking cookies
72
+ </label>
73
+ <label class="consentLabel" for="consent-purpose-analytics">
74
+ <input id="consent-purpose-analytics" type="checkbox" on="change:siteConsent.setPurpose(purpose-analytics=event.checked)">
75
+ Analytics
76
+ </label>
77
+ </div>
78
+ <?php } ?>
79
  </div><?php if(isset($redux_builder_amp['amp-gdpr-compliance-select-privacy-page']) && $redux_builder_amp['amp-gdpr-compliance-select-privacy-page']){?>
80
  <div class="gdpr_fmi">
81
  <span><?php echo esc_html__($more_info,'accelerated-mobile-pages'); ?></span>
includes/features/analytics/analytics-functions.php CHANGED
@@ -385,6 +385,32 @@ function ampforwp_analytics() {
385
  </script>
386
  </amp-analytics>
387
  <?php }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
388
  if( true == ampforwp_get_setting('ampforwp-iotech-switch')) {
389
  $project_id = $id = $title = $author = $categories = $cat_names = '';
390
  $project_id = ampforwp_get_setting('ampforwp-iotech-projectid');
385
  </script>
386
  </amp-analytics>
387
  <?php }
388
+ if( true == ampforwp_get_setting('amp-atinternet-switch')) {
389
+ $site_id = $site_url = $title = '';
390
+ $site_id = ampforwp_get_setting('amp-atinternet-site-id');
391
+ $site_url = site_url();
392
+ $title = get_the_title(ampforwp_get_the_ID());
393
+ if (!empty($site_id)) {?>
394
+ <amp-analytics type="atinternet" id="atinternet">
395
+ <script type="application/json">
396
+ {
397
+ "vars": {
398
+ "site": "<?php echo esc_attr($site_id);?>",
399
+ "log": "logs",
400
+ "domain": "<?php echo esc_attr($site_url);?>",
401
+ "title": "<?php echo esc_attr($title);?>",
402
+ "level2": "10"
403
+ },
404
+ "triggers": {
405
+ "defaultPageview": {
406
+ "on": "visible",
407
+ "request": "pageview"
408
+ }
409
+ }
410
+ }
411
+ </script>
412
+ </amp-analytics>
413
+ <?php } }
414
  if( true == ampforwp_get_setting('ampforwp-iotech-switch')) {
415
  $project_id = $id = $title = $author = $categories = $cat_names = '';
416
  $project_id = ampforwp_get_setting('ampforwp-iotech-projectid');
includes/features/analytics/analytics-options.php CHANGED
@@ -648,6 +648,26 @@ function ampforwp_analytics_options($opt_name){
648
  'default' => 0,
649
  'tooltip-subtitle' => sprintf('%s <a href="%s" target="_blank">%s</a> %s',
650
  esc_html__('Enable this option to track plausible analytics in AMP and', 'accelerated-mobile-pages'), esc_url('https://ampforwp.com/tutorials/article/how-to-add-plausible-analytics-in-amp/'),esc_html__('Click Here','accelerated-mobile-pages'), esc_html__('for more info','accelerated-mobile-pages')),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
651
  ),
652
  )
653
  )
648
  'default' => 0,
649
  'tooltip-subtitle' => sprintf('%s <a href="%s" target="_blank">%s</a> %s',
650
  esc_html__('Enable this option to track plausible analytics in AMP and', 'accelerated-mobile-pages'), esc_url('https://ampforwp.com/tutorials/article/how-to-add-plausible-analytics-in-amp/'),esc_html__('Click Here','accelerated-mobile-pages'), esc_html__('for more info','accelerated-mobile-pages')),
651
+ ),
652
+ // AT internet Analytics
653
+ array(
654
+ 'id' =>'amp-atinternet-switch',
655
+ 'type' => 'switch',
656
+ 'title' => esc_html__('AT internet Analytics','accelerated-mobile-pages'),
657
+ 'default' => 0,
658
+ 'tooltip-subtitle' => sprintf('%s <a href="%s" target="_blank">%s</a> %s',
659
+ esc_html__('Enable this option to track AT internet analytics in AMP and', 'accelerated-mobile-pages'), esc_url('https://ampforwp.com/tutorials/article/how-to-add-atinternet-analytics-in-amp/'),esc_html__('Click Here','accelerated-mobile-pages'), esc_html__('for more info','accelerated-mobile-pages')),
660
+ ),
661
+ array(
662
+ 'id' => 'amp-atinternet-site-id',
663
+ 'type' => 'text',
664
+ 'title' => esc_html__( 'Site ID', 'accelerated-mobile-pages' ),
665
+ 'tooltip-subtitle' =>
666
+ esc_html__( 'Enter your AT internet Analytics Site ID here','accelerated-mobile-pages'),
667
+ 'required' => array(
668
+ array('amp-atinternet-switch', '=' , '1')
669
+ ),
670
+ 'placeholder' => esc_html__('YOUR_SITE_ID_HERE','accelerated-mobile-pages'),
671
  ),
672
  )
673
  )
includes/features/functions.php CHANGED
@@ -65,6 +65,9 @@ function ampforwp_add_admin_styling($hook_suffix){
65
  if (function_exists('aeccglobal_setup')) {
66
  remove_action( 'admin_footer', 'js_update_show_in_slider' );
67
  }
 
 
 
68
  add_action('admin_notices', 'ampforwp_dev_mode_notice');
69
  add_action('admin_notices', 'ampforwp_plugins_manager_notice');
70
  add_action('admin_notices', 'ampforwp_ampwptheme_notice');
@@ -124,6 +127,9 @@ function ampforwp_add_admin_styling($hook_suffix){
124
  wp_enqueue_script( 'wp-color-picker' );
125
  wp_enqueue_script( 'ampforwp_admin_js' );
126
  }
 
 
 
127
  // 96. ampforwp_is_front_page() ampforwp_is_home() and ampforwp_is_blog is created
128
  function ampforwp_is_front_page(){
129
  global $redux_builder_amp;
65
  if (function_exists('aeccglobal_setup')) {
66
  remove_action( 'admin_footer', 'js_update_show_in_slider' );
67
  }
68
+ if (function_exists('appsero_init_tracker_tour_booking_manager')) {
69
+ add_action( 'wp_print_scripts', 'ampforwp_dequeue_tour_booking_script', 100 );
70
+ }
71
  add_action('admin_notices', 'ampforwp_dev_mode_notice');
72
  add_action('admin_notices', 'ampforwp_plugins_manager_notice');
73
  add_action('admin_notices', 'ampforwp_ampwptheme_notice');
127
  wp_enqueue_script( 'wp-color-picker' );
128
  wp_enqueue_script( 'ampforwp_admin_js' );
129
  }
130
+ function ampforwp_dequeue_tour_booking_script() {
131
+ wp_dequeue_script( 'ttbm_mp_script' );
132
+ }
133
  // 96. ampforwp_is_front_page() ampforwp_is_home() and ampforwp_is_blog is created
134
  function ampforwp_is_front_page(){
135
  global $redux_builder_amp;
includes/features/notice-bar/notice-bar-options.php CHANGED
@@ -210,6 +210,13 @@ function ampforwp_notice_bar_options($opt_name){
210
  'title' => esc_html__('Privacy Page Button Text', 'accelerated-mobile-pages'),
211
  'default' => 'Click Here',
212
  'required' => array('amp-gdpr-compliance-switch', '=' , '1'),
 
 
 
 
 
 
 
213
  ),
214
  array(
215
  'id' => 'ampforwp-notice-quantcast',
210
  'title' => esc_html__('Privacy Page Button Text', 'accelerated-mobile-pages'),
211
  'default' => 'Click Here',
212
  'required' => array('amp-gdpr-compliance-switch', '=' , '1'),
213
+ ),
214
+ array(
215
+ 'id' =>'amp-gdpr-newguidelines-switch',
216
+ 'type' => 'switch',
217
+ 'class' => 'child_opt',
218
+ 'title' => esc_html__('New Guidelines', 'accelerated-mobile-pages'),
219
+ 'default' => 0,
220
  ),
221
  array(
222
  'id' => 'ampforwp-notice-quantcast',
includes/mb-helper-function.php CHANGED
@@ -70,7 +70,9 @@ function ampforwp_send_feedback() {
70
 
71
  $subject = isset( $form['ampforwp_disable_reason'] ) ? $form['ampforwp_disable_reason'] : '(no reason given)';
72
 
73
- if($subject == 'technical issue'){
 
 
74
 
75
  $text = trim($text);
76
 
70
 
71
  $subject = isset( $form['ampforwp_disable_reason'] ) ? $form['ampforwp_disable_reason'] : '(no reason given)';
72
 
73
+ $subject = $subject.' - Accelerated Mobile Pages';
74
+
75
+ if($subject == 'technical - Accelerated Mobile Pages'){
76
 
77
  $text = trim($text);
78
 
includes/options/admin-config.php CHANGED
@@ -4468,6 +4468,16 @@ Redux::setSection( $opt_name, array(
4468
  array('ampforwp-google-font-switch', '=', '1'),
4469
  )
4470
  ),
 
 
 
 
 
 
 
 
 
 
4471
  array(
4472
  'id' => 'ampforwp-local-font-switch',
4473
  'type' => 'switch',
4468
  array('ampforwp-google-font-switch', '=', '1'),
4469
  )
4470
  ),
4471
+ array(
4472
+ 'id' => 'ampforwp_font_display',
4473
+ 'type' => 'select',
4474
+ 'title' => esc_html__('Font Display', 'accelerated-mobile-pages'),
4475
+ 'options' => array(
4476
+ 'optional' => 'Optional',
4477
+ 'swap' => 'Swap'
4478
+ ),
4479
+ 'default' => 'optional',
4480
+ ),
4481
  array(
4482
  'id' => 'ampforwp-local-font-switch',
4483
  'type' => 'switch',
includes/options/redux-core/framework.php CHANGED
@@ -2846,9 +2846,7 @@
2846
 
2847
  $values = $values[ $redux->args['opt_name'] ];
2848
 
2849
- if ( version_compare( PHP_VERSION, '7.4', '<' ) && function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() ) {
2850
- $values = array_map( 'stripslashes_deep', $values );
2851
- }
2852
 
2853
  if ( ! empty ( $values ) ) {
2854
 
2846
 
2847
  $values = $values[ $redux->args['opt_name'] ];
2848
 
2849
+ $values = array_map( 'stripslashes_deep', $values );
 
 
2850
 
2851
  if ( ! empty ( $values ) ) {
2852
 
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: mohammed_kaludi, ahmedkaludi, ampforwp
3
  Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, google, plugin, SEO
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
- Tested up to: 5.9.1
7
- Stable tag: 1.0.77.38
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -194,6 +194,17 @@ You can contact us from [here](https://ampforwp.com/contact/)
194
 
195
  == Changelog ==
196
 
 
 
 
 
 
 
 
 
 
 
 
197
  = 1.0.77.38 (7th March 2022) =
198
  * Improvements: Added The Publisher Desk Support #5213
199
  * Fixed: Displaying a blank white screen when embed URLs are used #5193
@@ -202,19 +213,4 @@ You can contact us from [here](https://ampforwp.com/contact/)
202
  * Improvements: Added new infinite scrolling experience #4791
203
  * Fixed: The links in embed URLs are not clickable #5193
204
 
205
- = 1.0.77.37 (2nd March 2022) =
206
- * Improvements: Added feedback form with auto email system #5223
207
- * Improvements: Added new infinite scrolling experience #4791
208
- * Improvements: Added An option to add lang_ and privacyMode values in Quantcast #5206
209
- * Improvements: Added FireWork compatibility #5210
210
- * Fixed: AMP autocomplete tag is not working #5217
211
- * Fixed: Autoplay functionality not working in video module #5219
212
- * Fixed: Fonts loading twice in Global font family #5220
213
- * Fixed: Unable to connect to Matomo analytics #5221
214
-
215
- = 1.0.77.36 (18th February 2022) =
216
- * Fixed: If the server-side cache is aggressive then the pagination URL with ?amp=1 is redirecting to non-AMP #5208
217
- * Fixed: Errror getting in featured-image.php, on line 77 #5207
218
- * Fixed: Need to keep the mobile redirection filter outside of any condition #5216
219
-
220
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
3
  Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, google, plugin, SEO
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
+ Tested up to: 5.9.2
7
+ Stable tag: 1.0.77.39
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
194
 
195
  == Changelog ==
196
 
197
+ = 1.0.77.39 (5th April 2022) =
198
+ * Improvements: Added New Guidelines in GDPR #5225
199
+ * Improvements: Added AT internet analytics support #5233
200
+ * Improvements: UI improved of feedback form #5223
201
+ * Fixed: Header and footer showing twice in new infine scroll #5238
202
+ * Fixed: AMP option panel not working with Tour Booking Manager plugin #5236
203
+ * Fixed: Font style not loading correctly on first page load #5224
204
+ * Fixed: The hamburger icon is not clickable when Font Icon Library is selected as CSS Icons #5243
205
+ * Fixed: Duplicate li tags removed #5241
206
+ * Fixed: Warning compatibility PHP 8.0 #5245
207
+
208
  = 1.0.77.38 (7th March 2022) =
209
  * Improvements: Added The Publisher Desk Support #5213
210
  * Fixed: Displaying a blank white screen when embed URLs are used #5193
213
  * Improvements: Added new infinite scrolling experience #4791
214
  * Fixed: The links in embed URLs are not clickable #5193
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/comments.php CHANGED
@@ -76,7 +76,6 @@ if ( ! defined( 'ABSPATH' ) ) {
76
  </div>
77
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
78
  </article> <!-- .cmt-body -->
79
- </li> <!-- #li-comment-## -->
80
  <?php
81
  }// end of ampforwp_custom_translated_comment()
82
 
76
  </div>
77
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
78
  </article> <!-- .cmt-body -->
 
79
  <?php
80
  }// end of ampforwp_custom_translated_comment()
81
 
templates/design-manager/design-2/elements/comments.php CHANGED
@@ -76,7 +76,6 @@ if ( ! defined( 'ABSPATH' ) ) {
76
  </div>
77
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
78
  </article> <!-- .cmt-body -->
79
- </li> <!-- #li-comment-## -->
80
  <?php
81
  }// end of ampforwp_custom_translated_comment()
82
 
76
  </div>
77
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
78
  </article> <!-- .cmt-body -->
 
79
  <?php
80
  }// end of ampforwp_custom_translated_comment()
81
 
templates/design-manager/design-3/elements/comments.php CHANGED
@@ -76,7 +76,6 @@ do_action('ampforwp_before_comment_hook',$this);
76
  </div>
77
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
78
  </article> <!-- .cmt-body -->
79
- </li> <!-- #li-comment-## -->
80
  <?php
81
  }// end of ampforwp_custom_translated_comment()
82
 
76
  </div>
77
  <?php do_action('ampforwp_reply_comment_form', $comment, $args, $depth); ?>
78
  </article> <!-- .cmt-body -->
 
79
  <?php
80
  }// end of ampforwp_custom_translated_comment()
81
 
templates/design-manager/swift/footer.php CHANGED
@@ -8,8 +8,13 @@ global $redux_builder_amp ?>
8
  <?php
9
  do_action( 'levelup_foot');
10
  if(!ampforwp_levelup_compatibility('hf_builder_foot') ){
11
- if ( isset($redux_builder_amp['footer-type']) && '1' == $redux_builder_amp['footer-type'] ) { ?>
12
- <footer class="footer">
 
 
 
 
 
13
  <?php if ( is_active_sidebar( 'swift-footer-widget-area' ) ) : ?>
14
  <div class="f-w-f1">
15
  <div class="cntr">
8
  <?php
9
  do_action( 'levelup_foot');
10
  if(!ampforwp_levelup_compatibility('hf_builder_foot') ){
11
+ if ( isset($redux_builder_amp['footer-type']) && '1' == $redux_builder_amp['footer-type'] ) {
12
+ $hide_infine_scroll = '';
13
+ if (true == ampforwp_get_setting('ampforwp-infinite-scroll-new-features')) {
14
+ $hide_infine_scroll = 'next-page-hide';
15
+ }
16
+ ?>
17
+ <footer class="footer" <?php echo esc_html($hide_infine_scroll) ?>>
18
  <?php if ( is_active_sidebar( 'swift-footer-widget-area' ) ) : ?>
19
  <div class="f-w-f1">
20
  <div class="cntr">
templates/design-manager/swift/header.php CHANGED
@@ -16,8 +16,12 @@ if( !ampforwp_levelup_compatibility('hf_builder_head') ){
16
  ?>
17
  <?php if($header_type == '1'){?>
18
  <?php do_action('ampforwp_admin_menu_bar_front');
19
- do_action('ampforwp_reading_progress_bar'); ?>
20
- <header class="header h_m h_m_1">
 
 
 
 
21
  <?php do_action('ampforwp_header_top_design4'); ?>
22
  <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
23
  <div class="hamb-mnu">
@@ -155,8 +159,13 @@ if( !ampforwp_levelup_compatibility('hf_builder_head') ){
155
  </header>
156
  <?php } ?>
157
  <?php if($header_type == '2'){
158
- do_action('ampforwp_reading_progress_bar'); ?>
159
- <header class="header-2 h_m h_m_1">
 
 
 
 
 
160
  <?php do_action('ampforwp_header_top_design4'); ?>
161
  <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
162
  <div class="hamb-mnu">
@@ -296,8 +305,13 @@ if( !ampforwp_levelup_compatibility('hf_builder_head') ){
296
  </header>
297
  <?php } ?>
298
  <?php if($header_type == '3'){
299
- do_action('ampforwp_reading_progress_bar'); ?>
300
- <header class="header-3 h_m h_m_1">
 
 
 
 
 
301
  <?php do_action('ampforwp_header_top_design4'); ?>
302
  <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
303
  <div class="hamb-mnu">
16
  ?>
17
  <?php if($header_type == '1'){?>
18
  <?php do_action('ampforwp_admin_menu_bar_front');
19
+ do_action('ampforwp_reading_progress_bar');
20
+ $hide_infine_scroll = '';
21
+ if (true == ampforwp_get_setting('ampforwp-infinite-scroll-new-features')) {
22
+ $hide_infine_scroll = 'next-page-hide';
23
+ }?>
24
+ <header class="header h_m h_m_1" <?php echo esc_html($hide_infine_scroll) ?>>
25
  <?php do_action('ampforwp_header_top_design4'); ?>
26
  <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
27
  <div class="hamb-mnu">
159
  </header>
160
  <?php } ?>
161
  <?php if($header_type == '2'){
162
+ do_action('ampforwp_reading_progress_bar');
163
+ $hide_infine_scroll = '';
164
+ if (true == ampforwp_get_setting('ampforwp-infinite-scroll-new-features')) {
165
+ $hide_infine_scroll = 'next-page-hide';
166
+ }
167
+ ?>
168
+ <header class="header-2 h_m h_m_1" <?php echo esc_html($hide_infine_scroll) ?>>
169
  <?php do_action('ampforwp_header_top_design4'); ?>
170
  <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
171
  <div class="hamb-mnu">
305
  </header>
306
  <?php } ?>
307
  <?php if($header_type == '3'){
308
+ do_action('ampforwp_reading_progress_bar');
309
+ $hide_infine_scroll = '';
310
+ if (true == ampforwp_get_setting('ampforwp-infinite-scroll-new-features')) {
311
+ $hide_infine_scroll = 'next-page-hide';
312
+ }
313
+ ?>
314
+ <header class="header-3 h_m h_m_1" <?php echo esc_html($hide_infine_scroll) ?>>
315
  <?php do_action('ampforwp_header_top_design4'); ?>
316
  <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
317
  <div class="hamb-mnu">
templates/design-manager/swift/style.php CHANGED
@@ -184,7 +184,7 @@ $callnowcolor = ampforwp_get_setting('amp-opt-color-rgba-colorscheme-call');
184
  if($header_type == '1'){?>
185
  .logo{z-index: 2;flex-grow: 1;align-self: center;text-align:center;line-height:0;}
186
  .h-1{display:flex;order:1;}
187
- .h-nav{order: -1;align-self: center;}
188
  .h-ic:last-child{margin-right:0;}
189
  <?php } ?>
190
  <?php //hyder-type-2
184
  if($header_type == '1'){?>
185
  .logo{z-index: 2;flex-grow: 1;align-self: center;text-align:center;line-height:0;}
186
  .h-1{display:flex;order:1;}
187
+ .h-nav{order: -1;align-self: center;flex-basis: 30px;}
188
  .h-ic:last-child{margin-right:0;}
189
  <?php } ?>
190
  <?php //hyder-type-2
templates/features.php CHANGED
@@ -6136,7 +6136,11 @@ if ( ! function_exists( 'ampforwp_google_fonts_generator' ) ) {
6136
  }
6137
  $font_output .= "@font-face { ";
6138
  $font_output .= "font-family: " . esc_attr(ampforwp_get_setting('amp_font_selector_content_single')). ';' ;
6139
- $font_output .= "font-display: optional".';';
 
 
 
 
6140
  $font_output .= "font-style: " . esc_attr($font_style) . ';';
6141
  $font_output .= "font-weight: " . esc_attr($font_weight) . ';' ;
6142
  $font_output .= "src: local('". esc_attr(ampforwp_get_setting('amp_font_selector_content_single'))." ".esc_attr($font_local_weight)." ".esc_attr($font_local_type)."'), local('". esc_attr(ampforwp_get_setting('amp_font_selector_content_single'))."-".esc_attr($font_local_weight).$font_local_type."'), url(" .esc_url(str_replace("http://", "https://", $font_data->files->$value)) . ');' ;
6136
  }
6137
  $font_output .= "@font-face { ";
6138
  $font_output .= "font-family: " . esc_attr(ampforwp_get_setting('amp_font_selector_content_single')). ';' ;
6139
+ if (ampforwp_get_setting('ampforwp_font_display') == 'optional') {
6140
+ $font_output .= "font-display: optional".';';
6141
+ }else{
6142
+ $font_output .= "font-display: swap".';';
6143
+ }
6144
  $font_output .= "font-style: " . esc_attr($font_style) . ';';
6145
  $font_output .= "font-weight: " . esc_attr($font_weight) . ';' ;
6146
  $font_output .= "src: local('". esc_attr(ampforwp_get_setting('amp_font_selector_content_single'))." ".esc_attr($font_local_weight)." ".esc_attr($font_local_type)."'), local('". esc_attr(ampforwp_get_setting('amp_font_selector_content_single'))."-".esc_attr($font_local_weight).$font_local_type."'), url(" .esc_url(str_replace("http://", "https://", $font_data->files->$value)) . ');' ;