AMP for WP – Accelerated Mobile Pages - Version 0.9.98.16

Version Description

(18th November 2019) = * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684 * Improvement: Add filter to modify HTML attributes #3685 * Fixed:Jetpack causing errors after update #3849 * Fixed: Facebook like button is not showing correctly after last update in design3 #3742 * Fixed:[URGENT] Vuukle API KEY missing #3792 * Fixed:Admin tool bar css is not loading #3788 * Fixed:Hide button always showing on page #3762 * Fixed:Meta description are not showing properly in genesis #3761 * Fixed:Non-Responsive tables after version 0.9.98.9 #3746 * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717 * Fixed:Homepage posts image alignment issue #3691 * Fixed:Lightbox not working for single images #3683 * Fixed:Notice: Undefined index: category #3829 * Fixed:Notice: Undefined variable: category_name #3827 * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824 * Fixed:Warning when trying to save the option #3800

Download this release

Release Info

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

Code changes from version 0.9.98.15 to 0.9.98.16

Files changed (16) hide show
  1. README.md +19 -1
  2. accelerated-moblie-pages.php +2 -2
  3. changelog.txt +18 -0
  4. components/comments/comments.php +3 -0
  5. includes/admin-style.css +1 -1
  6. includes/features/analytics/analytics-functions.php +3 -1
  7. includes/features/functions.php +11 -8
  8. includes/redirect.php +1 -1
  9. includes/vendor/amp/includes/class-amp-post-template.php +1 -1
  10. includes/vendor/vendor-changelog.txt +2 -1
  11. readme.txt +19 -9
  12. templates/category-widget.php +1 -1
  13. templates/design-manager/design-3/style.php +1 -0
  14. templates/design-manager/swift/footer.php +1 -1
  15. templates/design-manager/swift/style.php +2 -2
  16. templates/features.php +18 -10
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.3
7
- Stable tag: 0.9.98.15
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -191,6 +191,24 @@ You can contact us from [here](https://ampforwp.com/contact/)
191
 
192
  == Changelog ==
193
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
194
  = 0.9.98.15 (15th November 2019) =
195
  * Improvement: New UX for AMP Options Panel #3520
196
  * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3
7
+ Stable tag: 0.9.98.16
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
191
 
192
  == Changelog ==
193
 
194
+ = 0.9.98.16 (18th November 2019) =
195
+ * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
196
+ * Improvement: Add filter to modify HTML attributes #3685
197
+ * Fixed:Jetpack causing errors after update #3849
198
+ * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
199
+ * Fixed:[URGENT] Vuukle API KEY missing #3792
200
+ * Fixed:Admin tool bar css is not loading #3788
201
+ * Fixed:Hide button always showing on page #3762
202
+ * Fixed:Meta description are not showing properly in genesis #3761
203
+ * Fixed:Non-Responsive tables after version 0.9.98.9 #3746
204
+ * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
205
+ * Fixed:Homepage posts image alignment issue #3691
206
+ * Fixed:Lightbox not working for single images #3683
207
+ * Fixed:Notice: Undefined index: category #3829
208
+ * Fixed:Notice: Undefined variable: category_name #3827
209
+ * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
210
+ * Fixed:Warning when trying to save the option #3800
211
+
212
  = 0.9.98.15 (15th November 2019) =
213
  * Improvement: New UX for AMP Options Panel #3520
214
  * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
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: 0.9.98.15
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','0.9.98.15');
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: 0.9.98.16
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','0.9.98.16');
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,23 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 0.9.98.14 (7th OCTOBER 2019) =
4
  * Fixed: Value Attribute Stripping out from the forms added in the content. #3689
5
  * Fixed: Remove AAWP from extension list #3735
1
  == Changelog ==
2
 
3
+ = 0.9.98.16 (18th November 2019) =
4
+ * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
5
+ * Improvement: Add filter to modify HTML attributes #3685
6
+ * Fixed:Jetpack causing errors after update #3849
7
+ * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
8
+ * Fixed:[URGENT] Vuukle API KEY missing #3792
9
+ * Fixed:Admin tool bar css is not loading #3788
10
+ * Fixed:Hide button always showing on page #3762
11
+ * Fixed:Meta description are not showing properly in genesis #3761
12
+ * Fixed:Non-Responsive tables after version 0.9.98.9 #3746
13
+ * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
14
+ * Fixed:Homepage posts image alignment issue #3691
15
+ * Fixed:Lightbox not working for single images #3683
16
+ * Fixed:Notice: Undefined index: category #3829
17
+ * Fixed:Notice: Undefined variable: category_name #3827
18
+ * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
19
+ * Fixed:Warning when trying to save the option #3800
20
+
21
  = 0.9.98.14 (7th OCTOBER 2019) =
22
  * Fixed: Value Attribute Stripping out from the forms added in the content. #3689
23
  * Fixed: Remove AAWP from extension list #3735
components/comments/comments.php CHANGED
@@ -219,6 +219,9 @@ function ampforwp_framework_get_vuukle_comments(){
219
  $srcUrl = add_query_arg('url' ,get_permalink(), $srcUrl);
220
  $srcUrl = add_query_arg('host' ,$siteUrl, $srcUrl);
221
  $srcUrl = add_query_arg('id' , $post->ID, $srcUrl);
 
 
 
222
  $srcUrl = add_query_arg('title' , urlencode($post->post_title), $srcUrl);
223
  $srcUrl = add_query_arg('img' , esc_url($img), $srcUrl);
224
  $srcUrl = add_query_arg('tags' , urlencode($tag_name), $srcUrl);
219
  $srcUrl = add_query_arg('url' ,get_permalink(), $srcUrl);
220
  $srcUrl = add_query_arg('host' ,$siteUrl, $srcUrl);
221
  $srcUrl = add_query_arg('id' , $post->ID, $srcUrl);
222
+ if(!empty($apiKey)){
223
+ $srcUrl = add_query_arg('apiKey' , $apiKey, $srcUrl);
224
+ }
225
  $srcUrl = add_query_arg('title' , urlencode($post->post_title), $srcUrl);
226
  $srcUrl = add_query_arg('img' , esc_url($img), $srcUrl);
227
  $srcUrl = add_query_arg('tags' , urlencode($tag_name), $srcUrl);
includes/admin-style.css CHANGED
@@ -1535,7 +1535,7 @@ background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"
1535
  -o-box-shadow: @shadow;
1536
  box-shadow: @shadow;
1537
  }
1538
- .label {
1539
  position: absolute;
1540
  top: 56px;
1541
  bottom: 0;
1535
  -o-box-shadow: @shadow;
1536
  box-shadow: @shadow;
1537
  }
1538
+ .ampforwp-new-ux .label{
1539
  position: absolute;
1540
  top: 56px;
1541
  bottom: 0;
includes/features/analytics/analytics-functions.php CHANGED
@@ -408,10 +408,12 @@ function ampforwp_add_advance_ga_fields($ga_fields){
408
  $id = ampforwp_get_the_ID();
409
  $title = get_the_title($id);
410
  $category_detail = get_the_category($id);//$post->ID
 
411
  if ( ! empty( $category_detail ) ) {
412
  foreach($category_detail as $cd){
413
- $category_name = $cd->cat_name;
414
  }
 
415
  }
416
  $tags = get_the_tags( $id );
417
  $focusKeyword = '';
408
  $id = ampforwp_get_the_ID();
409
  $title = get_the_title($id);
410
  $category_detail = get_the_category($id);//$post->ID
411
+ $category_name = '';
412
  if ( ! empty( $category_detail ) ) {
413
  foreach($category_detail as $cd){
414
+ $category_name_array[] = $cd->cat_name;
415
  }
416
+ $category_name = implode( ', ', $category_name_array );
417
  }
418
  $tags = get_the_tags( $id );
419
  $focusKeyword = '';
includes/features/functions.php CHANGED
@@ -300,27 +300,30 @@ function ampforwp_generate_meta_desc($json=""){
300
  }
301
 
302
  //Genesis #1013
303
- if ( function_exists('genesis_meta') && 'genesis' == ampforwp_get_setting('ampforwp-seo-selection') ) {
304
  $genesis_description = '';
305
- if ( is_home() && is_front_page() && ! $redux_builder_amp['amp-frontpage-select-option'] ) {
306
  $genesis_description = genesis_get_seo_option( 'home_description' ) ? genesis_get_seo_option( 'home_description' ) : get_bloginfo( 'description' );
307
  }
 
 
 
308
  elseif ( is_home() && get_option( 'page_for_posts' ) && get_queried_object_id() ) {
309
  $post_id = get_option( 'page_for_posts' );
310
  if ( null !== $post_id || is_singular() ) {
311
- if ( genesis_get_custom_field( '_genesis_description', $post_id ) ) {
312
- $genesis_description = genesis_get_custom_field( '_genesis_description', $post_id );
313
  if ( $genesis_description ) {
314
  $desc = $genesis_description;
315
  }
316
  }
317
  }
318
  }
319
- elseif ( is_home() && $redux_builder_amp['amp-frontpage-select-option'] && get_option( 'page_on_front' ) ) {
320
  $post_id = get_option('page_on_front');
321
  if ( null !== $post_id || is_singular() ) {
322
- if ( genesis_get_custom_field( '_genesis_description', $post_id ) ) {
323
- $genesis_description = genesis_get_custom_field( '_genesis_description', $post_id );
324
  }
325
  }
326
  }
@@ -329,7 +332,7 @@ function ampforwp_generate_meta_desc($json=""){
329
  }
330
 
331
  if ( $genesis_description ) {
332
- $desc = $genesis_description;
333
  }
334
  }
335
  // SEOPress #1589
300
  }
301
 
302
  //Genesis #1013
303
+ if ( function_exists('genesis_get_seo_meta_description') && 'genesis' == ampforwp_get_setting('ampforwp-seo-selection') ) {
304
  $genesis_description = '';
305
+ if ( is_home() && is_front_page() && ! ampforwp_get_setting('amp-frontpage-select-option') ) {
306
  $genesis_description = genesis_get_seo_option( 'home_description' ) ? genesis_get_seo_option( 'home_description' ) : get_bloginfo( 'description' );
307
  }
308
+ elseif(ampforwp_is_front_page()){
309
+ $genesis_description = strip_tags(genesis_get_custom_field( '_genesis_description', intval($post_id) ));
310
+ }
311
  elseif ( is_home() && get_option( 'page_for_posts' ) && get_queried_object_id() ) {
312
  $post_id = get_option( 'page_for_posts' );
313
  if ( null !== $post_id || is_singular() ) {
314
+ if ( genesis_get_custom_field( '_genesis_description', intval($post_id) ) ) {
315
+ $genesis_description = strip_tags(genesis_get_custom_field( '_genesis_description', intval($post_id) ));
316
  if ( $genesis_description ) {
317
  $desc = $genesis_description;
318
  }
319
  }
320
  }
321
  }
322
+ elseif ( is_home() && ampforwp_get_setting('amp-frontpage-select-option') && get_option( 'page_on_front' ) ) {
323
  $post_id = get_option('page_on_front');
324
  if ( null !== $post_id || is_singular() ) {
325
+ if ( genesis_get_custom_field( '_genesis_description', intval($post_id) ) ) {
326
+ $genesis_description = strip_tags(genesis_get_custom_field( '_genesis_description', intval($post_id) ));
327
  }
328
  }
329
  }
332
  }
333
 
334
  if ( $genesis_description ) {
335
+ $desc = esc_html($genesis_description);
336
  }
337
  }
338
  // SEOPress #1589
includes/redirect.php CHANGED
@@ -257,7 +257,7 @@ function ampforwp_redirection() {
257
  return;
258
  }
259
 
260
- if ( ! session_id() ) {
261
  session_start();
262
  }
263
 
257
  return;
258
  }
259
 
260
+ if ( function_exists('session_id') && ! session_id() ) {
261
  session_start();
262
  }
263
 
includes/vendor/amp/includes/class-amp-post-template.php CHANGED
@@ -449,7 +449,7 @@ class AMP_Post_Template {
449
  if ( $lang ) {
450
  $attributes['lang'] = $lang;
451
  }
452
-
453
  $this->add_data_by_key( 'html_tag_attributes', $attributes );
454
  }
455
 
449
  if ( $lang ) {
450
  $attributes['lang'] = $lang;
451
  }
452
+ $attributes = apply_filters('ampforwp_modify_html_attributes', $attributes);
453
  $this->add_data_by_key( 'html_tag_attributes', $attributes );
454
  }
455
 
includes/vendor/vendor-changelog.txt CHANGED
@@ -86,4 +86,5 @@ Reason: To extend the functionality of sidebars and Pagebuilder
86
  56. whitelisted skype in anchor tags #3475
87
  57. Telegram links has been whitelisted in anchor tags #3578
88
  58. Improvement in iframe #3563
89
- 59. Condition added in Wistia sanitizer to disable scripts when AMP Page Builder is enabled. #3587
 
86
  56. whitelisted skype in anchor tags #3475
87
  57. Telegram links has been whitelisted in anchor tags #3578
88
  58. Improvement in iframe #3563
89
+ 59. Condition added in Wistia sanitizer to disable scripts when AMP Page Builder is enabled. #3587
90
+ 60. Added the Filter to modify attributes in HTML Tag #3685
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.3
7
- Stable tag: 0.9.98.15
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -191,6 +191,24 @@ You can contact us from [here](https://ampforwp.com/contact/)
191
 
192
  == Changelog ==
193
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
194
  = 0.9.98.15 (15th November 2019) =
195
  * Improvement: New UX for AMP Options Panel #3520
196
  * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
@@ -201,13 +219,5 @@ You can contact us from [here](https://ampforwp.com/contact/)
201
  * Fixed: Data is not saving while Importing options from the json file #3667
202
  * Fixed: Debug warning #3723, #3729, #3730, #3731
203
 
204
- = 0.9.98.13 (27th SEPTEMBER 2019) =
205
- * Improvements: Need to create an option to clear the cache in tree shaking #3680
206
- * Improvements: Only get the required dashicons for Admin Toolbar #3707
207
- * Fixed: When enabling Treeshaking it removes the Swift icons TTF #3665
208
- * Fixed: List numbers are not in position #3704
209
- * Fixed: Menu Auto closing when # in the url #3633
210
- * Fixed: Facebook Like script not loading #3633
211
-
212
 
213
  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.3
7
+ Stable tag: 0.9.98.16
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
191
 
192
  == Changelog ==
193
 
194
+ = 0.9.98.16 (18th November 2019) =
195
+ * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
196
+ * Improvement: Add filter to modify HTML attributes #3685
197
+ * Fixed:Jetpack causing errors after update #3849
198
+ * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
199
+ * Fixed:[URGENT] Vuukle API KEY missing #3792
200
+ * Fixed:Admin tool bar css is not loading #3788
201
+ * Fixed:Hide button always showing on page #3762
202
+ * Fixed:Meta description are not showing properly in genesis #3761
203
+ * Fixed:Non-Responsive tables after version 0.9.98.9 #3746
204
+ * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
205
+ * Fixed:Homepage posts image alignment issue #3691
206
+ * Fixed:Lightbox not working for single images #3683
207
+ * Fixed:Notice: Undefined index: category #3829
208
+ * Fixed:Notice: Undefined variable: category_name #3827
209
+ * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
210
+ * Fixed:Warning when trying to save the option #3800
211
+
212
  = 0.9.98.15 (15th November 2019) =
213
  * Improvement: New UX for AMP Options Panel #3520
214
  * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
219
  * Fixed: Data is not saving while Importing options from the json file #3667
220
  * Fixed: Debug warning #3723, #3729, #3730, #3731
221
 
 
 
 
 
 
 
 
 
222
 
223
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
templates/category-widget.php CHANGED
@@ -142,7 +142,7 @@ class AMPFORWP_Categories_Widget extends WP_Widget {
142
 
143
  echo '<option selected value="none">Recent Posts </option>';
144
  foreach( $categories as $category ) {
145
- echo '<option '. selected( $instance['category'], $category->term_id) . ' value="'. esc_attr($category->term_id) . '">' . esc_attr($category->name) . '</option>';
146
  } ?>
147
  </select>
148
  </label>
142
 
143
  echo '<option selected value="none">Recent Posts </option>';
144
  foreach( $categories as $category ) {
145
+ echo '<option '. selected( $selected_category, $category->term_id) . ' value="'. esc_attr($category->term_id) . '">' . esc_attr($category->name) . '</option>';
146
  } ?>
147
  </select>
148
  </label>
templates/design-manager/design-3/style.php CHANGED
@@ -182,6 +182,7 @@ a.amp-social-facebook-messenger,.amp-social-facebookmessenger{background:#d5e1e6
182
  .custom-amp-socialsharing-mewe{background:#b8d6e6}
183
  .sticky_social .whatsapp-share-icon{ padding: 4px 0px 14px 0px; height: 28px; top: -4px; position: relative; }
184
  .sticky_social .line-share-icon{ padding: 4px 0px 14px 0px; height: 28px; top: -4px; position: relative; }
 
185
  <?php }?>
186
  /*Sticky Head For Design 3*/
187
  #header{ background: #fff; text-align: center; height:50px; box-shadow:0 0 32px rgba(0,0,0,.15); }
182
  .custom-amp-socialsharing-mewe{background:#b8d6e6}
183
  .sticky_social .whatsapp-share-icon{ padding: 4px 0px 14px 0px; height: 28px; top: -4px; position: relative; }
184
  .sticky_social .line-share-icon{ padding: 4px 0px 14px 0px; height: 28px; top: -4px; position: relative; }
185
+ .sticky_social amp-facebook-like{margin-bottom:-8px;}
186
  <?php }?>
187
  /*Sticky Head For Design 3*/
188
  #header{ background: #fff; text-align: center; height:50px; box-shadow:0 0 32px rgba(0,0,0,.15); }
templates/design-manager/swift/footer.php CHANGED
@@ -91,7 +91,7 @@ if( (is_single() && $redux_builder_amp['enable-single-social-icons']) || (is_pag
91
 
92
  <?php }
93
  else { ?>
94
- <amp-facebook-like width=90 height=35 style="margin: 0 auto;margin-top: 5px;"
95
  layout="fixed"
96
  data-size="large"
97
  data-layout="button_count"
91
 
92
  <?php }
93
  else { ?>
94
+ <amp-facebook-like width=90 height=35 style="margin: 0 auto;"
95
  layout="fixed"
96
  data-size="large"
97
  data-layout="button_count"
templates/design-manager/swift/style.php CHANGED
@@ -559,7 +559,7 @@ table {
559
  overflow-x: auto;
560
  word-break: normal;
561
  }
562
- .artl-cnt table{ margin: 0 auto; text-align: center; width: 100%; display: inline-table; }
563
  p.nocomments {padding: 10px;color: #fff;}
564
  <?php if($redux_builder_amp['single-new-features'] && $redux_builder_amp['ampforwp-underline-content-links']){ ?>
565
  .artl-cnt a{
@@ -1414,7 +1414,7 @@ thead th {
1414
  display: block;
1415
  }
1416
  .b-w .fsp, .arch-psts .fsp{
1417
- flex-basis: calc(100% - 30px);
1418
  }
1419
  }
1420
  <?php } // AMP woocommerce condition ends
559
  overflow-x: auto;
560
  word-break: normal;
561
  }
562
+ .artl-cnt table{ margin: 0 auto; text-align: center; width: 100%; }
563
  p.nocomments {padding: 10px;color: #fff;}
564
  <?php if($redux_builder_amp['single-new-features'] && $redux_builder_amp['ampforwp-underline-content-links']){ ?>
565
  .artl-cnt a{
1414
  display: block;
1415
  }
1416
  .b-w .fsp, .arch-psts .fsp{
1417
+ flex-basis: calc(100%);
1418
  }
1419
  }
1420
  <?php } // AMP woocommerce condition ends
templates/features.php CHANGED
@@ -365,7 +365,7 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
365
  if ( 'page' == get_option( 'show_on_front') && is_front_page() && $get_front_page_reading_settings && $get_amp_homepage_support ){
366
  $modify_canonical = true;
367
  }
368
- if ( true == $modify_canonical && $page >= 2 && is_page() ) {
369
  add_filter('ampforwp_modify_rel_canonical','ampforwp_modify_amphtml_static_blog');
370
  }
371
  }
@@ -717,6 +717,12 @@ function ampforwp_title_callback( $post ) {
717
  global $redux_builder_amp;
718
  wp_nonce_field( basename( __FILE__ ), 'ampforwp_title_nonce' );
719
  $ampforwp_stored_meta = get_post_meta( $post->ID );
 
 
 
 
 
 
720
  if(!isset($ampforwp_stored_meta['ampforwp-amp-on-off'])){
721
  $ampforwp_stored_meta['ampforwp-amp-on-off'][0] = 'default';
722
  }
@@ -744,7 +750,7 @@ function ampforwp_title_callback( $post ) {
744
  set_transient('ampforwp_exclude_post_transient', $exclude_post_value);
745
  }
746
  }
747
- if ($post->post_type == 'page' && ampforwp_get_setting('amp-pages-meta-default') == 'hide' ) {
748
  $ampforwp_stored_meta['ampforwp-amp-on-off'][0] = 'hide-amp';
749
  }?>
750
  <p>
@@ -1175,7 +1181,7 @@ function ampforwp_sticky_social_icons(){
1175
  $facebook_like_url = '';
1176
  $facebook_like_url = $amp_permalink;
1177
  if ( $facebook_like_url ) { ?>
1178
- <amp-facebook-like width=90 height=18 style="margin-bottom:-18px;"
1179
  layout="fixed"
1180
  data-size="large"
1181
  data-layout="button_count"
@@ -2362,7 +2368,7 @@ function ampforwp_talking_to_robots() {
2362
  }
2363
  }
2364
  // Meta Robots Tag From Yoast #1563
2365
- if ( class_exists('WPSEO_Frontend') && 'yoast' == ampforwp_get_setting('ampforwp-seo-selections') && false == ampforwp_get_setting('amp-inspection-tool') ) {
2366
  $class_instance = '';
2367
  $class_instance = WPSEO_Frontend::get_instance();
2368
  // robots() will return and print the meta robots tag
@@ -5773,7 +5779,7 @@ function ampforwp_remove_ahref_lightbox(){
5773
  }
5774
  }
5775
  function ampforwp_remove_ahref_lightbox_in_amp( $content ) {
5776
- preg_match_all('/(<a(.*?)href=\"(.*?)\">(.*?)<img(.*?)src=\"(.*?)\"(.*?)\/>)/', $content, $matches);
5777
  if( count($matches[3])){
5778
  for( $i=0;$i<count($matches[3]);$i++){
5779
  $href_url = $matches[3][$i];
@@ -5782,12 +5788,12 @@ function ampforwp_remove_ahref_lightbox_in_amp( $content ) {
5782
  $href_url = end($href_url);
5783
  $href_url = pathinfo($href_url, PATHINFO_FILENAME);
5784
  }
5785
- if($matches[3][$i] == $matches[6][$i] || (!empty($href_url) && strpos($matches[6][$i], $href_url) !== false)){
5786
  $href = $matches[3][$i];
5787
- $src = $matches[6][$i];
5788
  $href_src = str_replace( '/', '\/', esc_url($href));
5789
  $image_src = str_replace( '/', '\/', esc_url($src));
5790
- $content = preg_replace('/<a(.*?)href=\"'.$href_src.'\"(.*?)>(<img(.*?)src=\"'.$image_src.'\"(.*?)\/>)<\/a>/i', '$3', $content);
5791
 
5792
  }
5793
  }
@@ -6026,7 +6032,9 @@ function ampforwp_vuukle_comments_markup() {
6026
  $srcUrl = add_query_arg('url' ,get_permalink(), $srcUrl);
6027
  $srcUrl = add_query_arg('host' ,$siteUrl, $srcUrl);
6028
  $srcUrl = add_query_arg('id' , $post->ID, $srcUrl);
6029
- $srcUrl = add_query_arg('apiKey' , $apiKey, $srcUrl);
 
 
6030
  $srcUrl = add_query_arg('title' , urlencode($post->post_title), $srcUrl);
6031
  $srcUrl = add_query_arg('img' , esc_url($img), $srcUrl);
6032
  $srcUrl = add_query_arg('tags' , urlencode($tag_name), $srcUrl);
@@ -6294,7 +6302,7 @@ function ampforwp_ia_meta_callback( $post ) {
6294
  global $redux_builder_amp;
6295
  wp_nonce_field( basename( __FILE__ ), 'ampforwp_ia_nonce' );
6296
  $ampforwp_stored_meta = get_post_meta( $post->ID );
6297
- if ( ! isset($ampforwp_stored_meta['ampforwp-ia-on-off'][0]) || $ampforwp_stored_meta['ampforwp-ia-on-off'][0] == 'hide-ia') {
6298
  $exclude_post_value = get_option('ampforwp_ia_exclude_post');
6299
  if ( $exclude_post_value == null ) {
6300
  $exclude_post_value[] = 0;
365
  if ( 'page' == get_option( 'show_on_front') && is_front_page() && $get_front_page_reading_settings && $get_amp_homepage_support ){
366
  $modify_canonical = true;
367
  }
368
+ if ( true == $modify_canonical && $page >= 2 && is_page() && false == ampforwp_get_setting('amp-core-end-point') ) {
369
  add_filter('ampforwp_modify_rel_canonical','ampforwp_modify_amphtml_static_blog');
370
  }
371
  }
717
  global $redux_builder_amp;
718
  wp_nonce_field( basename( __FILE__ ), 'ampforwp_title_nonce' );
719
  $ampforwp_stored_meta = get_post_meta( $post->ID );
720
+ $hide_show = '';
721
+ if(isset($ampforwp_stored_meta['ampforwp-amp-on-off'])){
722
+ $hide_show = $ampforwp_stored_meta['ampforwp-amp-on-off'];
723
+ }else{
724
+ $hide_show = ampforwp_get_setting('amp-pages-meta-default');
725
+ }
726
  if(!isset($ampforwp_stored_meta['ampforwp-amp-on-off'])){
727
  $ampforwp_stored_meta['ampforwp-amp-on-off'][0] = 'default';
728
  }
750
  set_transient('ampforwp_exclude_post_transient', $exclude_post_value);
751
  }
752
  }
753
+ if ($post->post_type == 'page' && ampforwp_get_setting('amp-pages-meta-default') == 'hide' && ($hide_show=='hide' || $hide_show=='hide-amp')) {
754
  $ampforwp_stored_meta['ampforwp-amp-on-off'][0] = 'hide-amp';
755
  }?>
756
  <p>
1181
  $facebook_like_url = '';
1182
  $facebook_like_url = $amp_permalink;
1183
  if ( $facebook_like_url ) { ?>
1184
+ <amp-facebook-like width=90 height=18
1185
  layout="fixed"
1186
  data-size="large"
1187
  data-layout="button_count"
2368
  }
2369
  }
2370
  // Meta Robots Tag From Yoast #1563
2371
+ if ( class_exists('WPSEO_Frontend') && 'yoast' == ampforwp_get_setting('ampforwp-seo-selection') && is_singular()) {
2372
  $class_instance = '';
2373
  $class_instance = WPSEO_Frontend::get_instance();
2374
  // robots() will return and print the meta robots tag
5779
  }
5780
  }
5781
  function ampforwp_remove_ahref_lightbox_in_amp( $content ) {
5782
+ preg_match_all('/(<a(.*?)href=\"(.*?)\"(.*?)>(.*?)<img(.*?)src=\"(.*?)\"(.*?)(.*?)[^>]*>)/', $content, $matches);
5783
  if( count($matches[3])){
5784
  for( $i=0;$i<count($matches[3]);$i++){
5785
  $href_url = $matches[3][$i];
5788
  $href_url = end($href_url);
5789
  $href_url = pathinfo($href_url, PATHINFO_FILENAME);
5790
  }
5791
+ if($matches[3][$i] == $matches[7][$i] || strpos($matches[7][$i], $href_url) !== false){
5792
  $href = $matches[3][$i];
5793
+ $src = $matches[7][$i];
5794
  $href_src = str_replace( '/', '\/', esc_url($href));
5795
  $image_src = str_replace( '/', '\/', esc_url($src));
5796
+ $content = preg_replace('/<a(.*?)href=\"'.$href_src.'\"(.*?)>(<img(.*?)src=\"'.$image_src.'\"(.*?)[^>]*>)<\/a>/i', '$3', $content);
5797
 
5798
  }
5799
  }
6032
  $srcUrl = add_query_arg('url' ,get_permalink(), $srcUrl);
6033
  $srcUrl = add_query_arg('host' ,$siteUrl, $srcUrl);
6034
  $srcUrl = add_query_arg('id' , $post->ID, $srcUrl);
6035
+ if(!empty($apiKey)){
6036
+ $srcUrl = add_query_arg('apiKey' , $apiKey, $srcUrl);
6037
+ }
6038
  $srcUrl = add_query_arg('title' , urlencode($post->post_title), $srcUrl);
6039
  $srcUrl = add_query_arg('img' , esc_url($img), $srcUrl);
6040
  $srcUrl = add_query_arg('tags' , urlencode($tag_name), $srcUrl);
6302
  global $redux_builder_amp;
6303
  wp_nonce_field( basename( __FILE__ ), 'ampforwp_ia_nonce' );
6304
  $ampforwp_stored_meta = get_post_meta( $post->ID );
6305
+ if ( ! isset($ampforwp_stored_meta['ampforwp-ia-on-off'][0]) && $ampforwp_stored_meta['ampforwp-ia-on-off'][0] == 'hide-ia') {
6306
  $exclude_post_value = get_option('ampforwp_ia_exclude_post');
6307
  if ( $exclude_post_value == null ) {
6308
  $exclude_post_value[] = 0;