AMP for WP – Accelerated Mobile Pages - Version 1.0.63

Version Description

(26th September 2020) = * Improvement: Added Reddit embeds support #4406 * Improvement: Added multi select for post type in loop field #4365 * Improvement: Added custom classes in Body tag in AMP in all Designs #4594 * Improvement: Added filter for GDPR on-off #4471 * Improvement: Added admin notice when wrong seo plugin is selected #4678 * Improvement: Added TikTok embed support #4504 * Improvement: Added related post on/off in YouTube #4503 * Improvement: Added Nofollow Link button on pricing tabs in AMP Page Builder #4505 * Improvement: Improved Lighthouse Audits #4654 * Improvement: Added filter for AMP front page function #4634 * Fixed: Facebook Instant Articles (FBIA) Crawler Ingestion not working #4463 * Fixed: Incontent related post not aligned if the post does not have featured image #4691 * Fixed: Incontent path passed to load_plugin_textdomain function #4694 * Fixed: Incorrect Styling for header area #4703 * Fixed: Breadcrumb links are not generating the "amp/" #4708 * Fixed: Google Analytics is not firing when GTM is enabled #4707 * Fixed: Featured Image doesnt appear on single post #4711 * Fixed: Code improvements for options panel #4622 #4532 #4407 #4090 * Fixed: Advanced section showing blank randomly #4741

Download this release

Release Info

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

Code changes from version 1.0.62.2 to 1.0.63

Files changed (48) hide show
  1. README.md +22 -1
  2. accelerated-moblie-pages.php +3 -3
  3. changelog.txt +21 -0
  4. components/comments/comments.php +1 -45
  5. components/components-core.php +17 -28
  6. components/related-posts/related-posts.php +1 -0
  7. components/search/search.php +1 -1
  8. images/wpquads-logo.png +0 -0
  9. includes/admin-script.js +8 -0
  10. includes/features/advertisement/ads-options.php +68 -1
  11. includes/features/analytics/analytics-functions.php +5 -1
  12. includes/features/analytics/analytics-options.php +1 -1
  13. includes/features/functions.php +77 -10
  14. includes/module-upgrade.js +6 -0
  15. includes/modules-upgrade.php +19 -0
  16. includes/options/admin-config.php +8 -6
  17. includes/options/redux-core/assets/css/redux-admin.css +102 -0
  18. includes/options/redux-core/inc/fields/multi_text/field_multi_text.js +1 -1
  19. includes/options/redux-core/inc/fields/multi_text/field_multi_text.min.js +1 -1
  20. includes/options/redux-core/inc/fields/multitext_repeater/field_multitext_repeater.js +1 -1
  21. includes/options/redux-core/inc/fields/multitext_repeater/field_multitext_repeater.min.js +1 -1
  22. includes/options/redux-core/inc/fields/repeater/field_repeater.js +1 -1
  23. includes/options/redux-core/inc/fields/repeater/field_repeater.min.js +1 -1
  24. includes/options/redux-core/inc/fields/slides/field_slides.js +1 -1
  25. includes/options/redux-core/inc/fields/slides/field_slides.min.js +1 -1
  26. includes/vendor/amp/includes/class-amp-post-template.php +13 -2
  27. includes/vendor/amp/includes/embeds/class-amp-reddit-embed.php +76 -0
  28. includes/vendor/tinymce-widget/js/tinymce-widget-pre33.js +6 -6
  29. includes/vendor/tinymce-widget/js/tinymce-widget-pre33.min.js +1 -1
  30. pagebuilder/modules/pricing-mod-module.php +15 -1
  31. pagebuilder/modules/video-module.php +16 -0
  32. readme.txt +22 -1
  33. templates/custom-amp-content.php +1 -0
  34. templates/design-manager.php +12 -32
  35. templates/design-manager/design-1/elements/related-posts.php +3 -0
  36. templates/design-manager/design-1/elements/simple-comment-button.php +0 -14
  37. templates/design-manager/design-1/style.php +3 -2
  38. templates/design-manager/design-2/elements/related-posts.php +3 -0
  39. templates/design-manager/design-2/elements/simple-comment-button.php +0 -14
  40. templates/design-manager/design-2/style.php +2 -2
  41. templates/design-manager/design-3/elements/related-posts.php +3 -0
  42. templates/design-manager/design-3/elements/simple-comment-button.php +0 -15
  43. templates/design-manager/design-3/style.php +3 -3
  44. templates/design-manager/swift/single.php +1 -1
  45. templates/design-manager/swift/style.php +12 -3
  46. templates/features.php +35 -56
  47. templates/template-mode/template-mode.php +1 -0
  48. 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.5
7
- Stable tag: 1.0.62.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -193,6 +193,27 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
193
 
194
  == Changelog ==
195
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
196
  = 1.0.62.2 (21st August 2020) =
197
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
198
  * Fixed: Validation error - accordion section must have 2 child tags #4208
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.5
7
+ Stable tag: 1.0.63
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.63 (26th September 2020) =
197
+ * Improvement: Added Reddit embeds support #4406
198
+ * Improvement: Added multi select for post type in loop field #4365
199
+ * Improvement: Added custom classes in Body tag in AMP in all Designs #4594
200
+ * Improvement: Added filter for GDPR on-off #4471
201
+ * Improvement: Added admin notice when wrong seo plugin is selected #4678
202
+ * Improvement: Added TikTok embed support #4504
203
+ * Improvement: Added related post on/off in YouTube #4503
204
+ * Improvement: Added Nofollow Link button on pricing tabs in AMP Page Builder #4505
205
+ * Improvement: Improved Lighthouse Audits #4654
206
+ * Improvement: Added filter for AMP front page function #4634
207
+ * Fixed: Facebook Instant Articles (FBIA) Crawler Ingestion not working #4463
208
+ * Fixed: Incontent related post not aligned if the post does not have featured image #4691
209
+ * Fixed: Incontent path passed to load_plugin_textdomain function #4694
210
+ * Fixed: Incorrect Styling for header area #4703
211
+ * Fixed: Breadcrumb links are not generating the "amp/" #4708
212
+ * Fixed: Google Analytics is not firing when GTM is enabled #4707
213
+ * Fixed: Featured Image doesn’t appear on single post #4711
214
+ * Fixed: Code improvements for options panel #4622 #4532 #4407 #4090
215
+ * Fixed: Advanced section showing blank randomly #4741
216
+
217
  = 1.0.62.2 (21st August 2020) =
218
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
219
  * Fixed: Validation error - accordion section must have 2 child tags #4208
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.62.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.62.2');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
@@ -700,7 +700,7 @@ if ( ! function_exists('ampforwp_init') ) {
700
 
701
  do_action( 'amp_init' );
702
 
703
- load_plugin_textdomain( 'accelerated-mobile-pages', false, trailingslashit(AMPFORWP_PLUGIN_DIR) . 'languages' );
704
 
705
  add_rewrite_endpoint( AMP_QUERY_VAR, EP_PERMALINK );
706
  add_post_type_support( 'post', AMP_QUERY_VAR );
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.63
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.63');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
700
 
701
  do_action( 'amp_init' );
702
 
703
+ load_plugin_textdomain( 'accelerated-mobile-pages', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
704
 
705
  add_rewrite_endpoint( AMP_QUERY_VAR, EP_PERMALINK );
706
  add_post_type_support( 'post', AMP_QUERY_VAR );
changelog.txt CHANGED
@@ -1,5 +1,26 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 1.0.62.2 (21st August 2020) =
4
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
5
  * Fixed: Validation error - accordion section must have 2 child tags #4208
1
  == Changelog ==
2
 
3
+ = 1.0.63 (26th September 2020) =
4
+ * Improvement: Added Reddit embeds support #4406
5
+ * Improvement: Added multi select for post type in loop field #4365
6
+ * Improvement: Added custom classes in Body tag in AMP in all Designs #4594
7
+ * Improvement: Added filter for GDPR on-off #4471
8
+ * Improvement: Added admin notice when wrong seo plugin is selected #4678
9
+ * Improvement: Added TikTok embed support #4504
10
+ * Improvement: Added related post on/off in YouTube #4503
11
+ * Improvement: Added Nofollow Link button on pricing tabs in AMP Page Builder #4505
12
+ * Improvement: Improved Lighthouse Audits #4654
13
+ * Improvement: Added filter for AMP front page function #4634
14
+ * Fixed: Facebook Instant Articles (FBIA) Crawler Ingestion not working #4463
15
+ * Fixed: Incontent related post not aligned if the post does not have featured image #4691
16
+ * Fixed: Incontent path passed to load_plugin_textdomain function #4694
17
+ * Fixed: Incorrect Styling for header area #4703
18
+ * Fixed: Breadcrumb links are not generating the "amp/" #4708
19
+ * Fixed: Google Analytics is not firing when GTM is enabled #4707
20
+ * Fixed: Featured Image doesn’t appear on single post #4711
21
+ * Fixed: Code improvements for options panel #4622 #4532 #4407 #4090
22
+ * Fixed: Advanced section showing blank randomly #4741
23
+
24
  = 1.0.62.2 (21st August 2020) =
25
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
26
  * Fixed: Validation error - accordion section must have 2 child tags #4208
components/comments/comments.php CHANGED
@@ -205,53 +205,9 @@ function ampforwp_framework_get_disqus_comments(){
205
  <?php
206
  }
207
  }
208
-
209
  function ampforwp_framework_get_vuukle_comments(){
210
- global $post, $redux_builder_amp;
211
- $apiKey ='';
212
- $tag_name ='';
213
- $img = get_the_post_thumbnail_url();
214
- $tags = get_the_tags($post->ID);
215
- if( isset($redux_builder_amp['ampforwp-vuukle-comments-apiKey']) && $redux_builder_amp['ampforwp-vuukle-comments-apiKey'] !== ""){
216
- $apiKey = $redux_builder_amp['ampforwp-vuukle-comments-apiKey'];
217
- }
218
- $siteUrl = trim(site_url(), '/');
219
- if (!preg_match('#^http(s)?://#', $siteUrl)) {
220
- $siteUrl = 'http://' . $siteUrl;
221
- }
222
- if($img == false){
223
- $img = plugins_url('accelerated-mobile-pages/images/150x150.png');
224
- }
225
- if($tags){
226
- foreach($tags as $individual_tag) {
227
- $tag_name = $individual_tag->name;
228
- }
229
- }
230
- $urlParts = parse_url($siteUrl);
231
- $siteUrl = preg_replace('/^www\./', '', $urlParts['host']);// remove www
232
- $srcUrl = 'https://cdn.vuukle.com/amp.html?';
233
- $srcUrl = add_query_arg('url' ,get_permalink(), $srcUrl);
234
- $srcUrl = add_query_arg('host' ,$siteUrl, $srcUrl);
235
- $srcUrl = add_query_arg('id' , $post->ID, $srcUrl);
236
- if(!empty($apiKey)){
237
- $srcUrl = add_query_arg('apiKey' , $apiKey, $srcUrl);
238
- }
239
- $srcUrl = add_query_arg('title' , urlencode($post->post_title), $srcUrl);
240
- $srcUrl = add_query_arg('img' , esc_url($img), $srcUrl);
241
- $srcUrl = add_query_arg('tags' , urlencode($tag_name), $srcUrl);
242
- if(ampforwp_get_setting('ampforwp-vuukle-comments-emoji')==false){
243
- $srcUrl = add_query_arg('emotes' , 'false', $srcUrl);
244
- }
245
- $consent = '';
246
- if(ampforwp_get_data_consent()){
247
- $consent = 'data-block-on-consent ';
248
- }
249
- $vuukle_html = '<amp-iframe width="600" height="350" '.esc_attr($consent).'layout="responsive" sandbox="allow-scripts allow-same-origin allow-modals allow-popups allow-forms" resizable frameborder="0" src="'.esc_url($srcUrl).'">
250
-
251
- <div overflow tabindex="0" role="button" aria-label="Show comments">'.esc_html__('Show comments','accelerated-mobile-pages').'</div></amp-iframe>';
252
- echo $vuukle_html; // escaped above
253
  }
254
-
255
  function ampforwp_framework_get_spotim_comments(){
256
  global $post;
257
  $spotId ='';
205
  <?php
206
  }
207
  }
 
208
  function ampforwp_framework_get_vuukle_comments(){
209
+ echo ampforwp_vuukle_comments_markup();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
210
  }
 
211
  function ampforwp_framework_get_spotim_comments(){
212
  global $post;
213
  $spotId ='';
components/components-core.php CHANGED
@@ -131,16 +131,11 @@ function amp_title(){
131
 
132
  // Excerpt
133
  function amp_excerpt( $no_of_words=15 ) {
134
- global $redux_builder_amp, $post;
135
  $post_id = '';
136
  $no_of_words = (int) $no_of_words;
137
-
138
- if ( ampforwp_is_front_page() ) {
139
- $post_id = ampforwp_get_frontpage_id();
140
- }
141
- else
142
- $post_id = $post->ID;
143
- if ( $post_id != null && true == $redux_builder_amp['enable-excerpt-single'] ) { ?>
144
  <p><?php
145
  if ( has_excerpt() ) {
146
  $content = get_the_excerpt();
@@ -290,7 +285,8 @@ function amp_breadcrumb(){
290
  // GDPR component
291
  function amp_gdpr(){
292
  global $loadComponent;
293
- if ( isset($loadComponent['AMP-gdpr']) && true == $loadComponent['AMP-gdpr'] ) {
 
294
  echo amp_gdpr_output();
295
  }
296
  }
@@ -298,12 +294,11 @@ function amp_gdpr(){
298
  //Get Core of AMP HTML
299
  function amp_header_core(){
300
  global $ampforwpTemplate;
301
- $post_id = get_queried_object_id();
302
  if ( ampforwp_polylang_front_page() ) {
303
  $post_id = pll_get_post(get_option('page_on_front'));
304
  }
305
  $thisTemplate = $ampforwpTemplate;
306
- global $redux_builder_amp;
307
  $html_tag_attributes = AMP_HTML_Utils::build_attributes_string( $thisTemplate->get( 'html_tag_attributes' ) );
308
 
309
  $bodyClass = '';
@@ -348,7 +343,7 @@ function amp_header_core(){
348
  if ( is_home() ) {
349
 
350
  $bodyClass = 'amp-index amp-home'.esc_attr( $thisTemplate->get( 'body_class' ) );
351
- if ($redux_builder_amp['amp-frontpage-select-option'] == 1) {
352
  $bodyClass = 'single-post design_3_wrapper';
353
  }
354
  if ( $ampforwp_custom_post_page == "page" && ampforwp_name_blog_page() ) {
@@ -365,7 +360,7 @@ function amp_header_core(){
365
  if ( is_search() ) {
366
  $bodyClass = 'amp_home_body archives_body design_3_wrapper';
367
  }
368
- if( true == $redux_builder_amp['amp-rtl-select-option'] ){
369
  $bodyClass .= ' rtl ';
370
  }
371
  $lightbox = '';
@@ -409,7 +404,7 @@ function amp_header_core(){
409
 
410
  function amp_header(){
411
  global $ampforwpTemplate;
412
- $post_id = get_queried_object_id();
413
  if ( ampforwp_polylang_front_page() ) {
414
  $post_id = pll_get_post(get_option('page_on_front'));
415
  }
@@ -422,7 +417,7 @@ function amp_header(){
422
 
423
  function amp_footer(){
424
  global $ampforwpTemplate;
425
- $post_id = get_queried_object_id();
426
  if ( ampforwp_polylang_front_page() ) {
427
  $post_id = pll_get_post(get_option('page_on_front'));
428
  }
@@ -436,7 +431,7 @@ function amp_footer(){
436
 
437
  function amp_footer_core(){
438
  global $ampforwpTemplate;
439
- $post_id = get_queried_object_id();
440
  if ( ampforwp_polylang_front_page() ) {
441
  $post_id = pll_get_post(get_option('page_on_front'));
442
  }
@@ -457,16 +452,14 @@ function amp_footer_core(){
457
 
458
  function amp_non_amp_link(){
459
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
460
- global $redux_builder_amp;
461
- echo '<span>' . strip_tags(ampforwp_translation($redux_builder_amp['amp-translator-footer-text'],'All Rights Reserved'),$allowed_tags) . '</span>' ;
462
- if($redux_builder_amp['amp-footer-link-non-amp-page']=='1') { ampforwp_view_nonamp(); }
463
  }
464
 
465
  // Back to Top
466
  function amp_back_to_top_link(){
467
- global $redux_builder_amp;
468
  if(true == ampforwp_get_setting('ampforwp-footer-top')){?>
469
- <a id="scrollToTopButton" title="back to top" on="tap:backtotop.scrollTo(duration=500)" class="btt" ></a>
470
  <?php
471
  global $wp;
472
  $current_url = home_url(add_query_arg(array($_GET), $wp->request));
@@ -536,11 +529,8 @@ function amp_content($post_id= ''){
536
  global $redux_builder_amp, $post, $ampforwpTemplate;
537
 
538
  if ( empty( $post_id )) {
539
- $post_id = get_queried_object_id();
540
- if ( ampforwp_is_front_page() ) {
541
- $post_id = ampforwp_get_frontpage_id();
542
- }
543
- elseif ( ampforwp_polylang_front_page() ) {
544
  $post_id = pll_get_post(get_option('page_on_front'));
545
  }
546
  }
@@ -656,8 +646,7 @@ function amp_date( $args=array() ) {
656
  add_action('amp_css', 'amp_theme_framework_rtl_styles');
657
  if( ! function_exists('amp_theme_framework_rtl_styles') ){
658
  function amp_theme_framework_rtl_styles(){
659
- global $redux_builder_amp;
660
- if( true === $redux_builder_amp['amp-rtl-select-option'] ){ ?>
661
  body.rtl {direction: rtl;}
662
  body amp-carousel{ direction: ltr;}
663
  <?php }
131
 
132
  // Excerpt
133
  function amp_excerpt( $no_of_words=15 ) {
134
+ global $post;
135
  $post_id = '';
136
  $no_of_words = (int) $no_of_words;
137
+ $post_id = ampforwp_get_the_ID();
138
+ if ( $post_id != null && true == ampforwp_get_setting('enable-excerpt-single') ) { ?>
 
 
 
 
 
139
  <p><?php
140
  if ( has_excerpt() ) {
141
  $content = get_the_excerpt();
285
  // GDPR component
286
  function amp_gdpr(){
287
  global $loadComponent;
288
+ $gdpr = apply_filters('ampforwp_on_off_gdpr', true);
289
+ if ( isset($loadComponent['AMP-gdpr']) && true == $loadComponent['AMP-gdpr'] && $gdpr) {
290
  echo amp_gdpr_output();
291
  }
292
  }
294
  //Get Core of AMP HTML
295
  function amp_header_core(){
296
  global $ampforwpTemplate;
297
+ $post_id = ampforwp_get_the_ID();
298
  if ( ampforwp_polylang_front_page() ) {
299
  $post_id = pll_get_post(get_option('page_on_front'));
300
  }
301
  $thisTemplate = $ampforwpTemplate;
 
302
  $html_tag_attributes = AMP_HTML_Utils::build_attributes_string( $thisTemplate->get( 'html_tag_attributes' ) );
303
 
304
  $bodyClass = '';
343
  if ( is_home() ) {
344
 
345
  $bodyClass = 'amp-index amp-home'.esc_attr( $thisTemplate->get( 'body_class' ) );
346
+ if (ampforwp_get_setting('amp-frontpage-select-option') == 1) {
347
  $bodyClass = 'single-post design_3_wrapper';
348
  }
349
  if ( $ampforwp_custom_post_page == "page" && ampforwp_name_blog_page() ) {
360
  if ( is_search() ) {
361
  $bodyClass = 'amp_home_body archives_body design_3_wrapper';
362
  }
363
+ if( true == ampforwp_get_setting('amp-rtl-select-option') ){
364
  $bodyClass .= ' rtl ';
365
  }
366
  $lightbox = '';
404
 
405
  function amp_header(){
406
  global $ampforwpTemplate;
407
+ $post_id = ampforwp_get_the_ID();
408
  if ( ampforwp_polylang_front_page() ) {
409
  $post_id = pll_get_post(get_option('page_on_front'));
410
  }
417
 
418
  function amp_footer(){
419
  global $ampforwpTemplate;
420
+ $post_id = ampforwp_get_the_ID();
421
  if ( ampforwp_polylang_front_page() ) {
422
  $post_id = pll_get_post(get_option('page_on_front'));
423
  }
431
 
432
  function amp_footer_core(){
433
  global $ampforwpTemplate;
434
+ $post_id = ampforwp_get_the_ID();
435
  if ( ampforwp_polylang_front_page() ) {
436
  $post_id = pll_get_post(get_option('page_on_front'));
437
  }
452
 
453
  function amp_non_amp_link(){
454
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
455
+ echo '<span>' . strip_tags(ampforwp_translation(ampforwp_get_setting('amp-translator-footer-text'),'All Rights Reserved'),$allowed_tags) . '</span>' ;
456
+ if(ampforwp_get_setting('amp-footer-link-non-amp-page')=='1') { ampforwp_view_nonamp(); }
 
457
  }
458
 
459
  // Back to Top
460
  function amp_back_to_top_link(){
 
461
  if(true == ampforwp_get_setting('ampforwp-footer-top')){?>
462
+ <a id="scrollToTopButton" title="back to top" on="tap:backtotop.scrollTo(duration=500)" class="btt" href="#" ></a>
463
  <?php
464
  global $wp;
465
  $current_url = home_url(add_query_arg(array($_GET), $wp->request));
529
  global $redux_builder_amp, $post, $ampforwpTemplate;
530
 
531
  if ( empty( $post_id )) {
532
+ $post_id = ampforwp_get_the_ID();
533
+ if ( ampforwp_polylang_front_page() ) {
 
 
 
534
  $post_id = pll_get_post(get_option('page_on_front'));
535
  }
536
  }
646
  add_action('amp_css', 'amp_theme_framework_rtl_styles');
647
  if( ! function_exists('amp_theme_framework_rtl_styles') ){
648
  function amp_theme_framework_rtl_styles(){
649
+ if( true === ampforwp_get_setting('amp-rtl-select-option') ){ ?>
 
650
  body.rtl {direction: rtl;}
651
  body amp-carousel{ direction: ltr;}
652
  <?php }
components/related-posts/related-posts.php CHANGED
@@ -57,6 +57,7 @@ function ampforwp_related_post_loop_query(){
57
  $orderby = 'rand';
58
  }
59
  $args=array(
 
60
  'post_type' => get_post_type($post),
61
  'posts_per_page'=> $int_number_of_related_posts,
62
  'post__not_in' => array($post->ID),
57
  $orderby = 'rand';
58
  }
59
  $args=array(
60
+ 'fields' => 'ids',
61
  'post_type' => get_post_type($post),
62
  'posts_per_page'=> $int_number_of_related_posts,
63
  'post__not_in' => array($post->ID),
components/search/search.php CHANGED
@@ -21,7 +21,7 @@ function ampforwp_framework_get_search_form() {
21
  <div class="amp-search-wrapper">
22
  <label aria-label="Type your query" class="screen-reader-text" for="s">' . esc_html__($label,'accelerated-mobile-pages') . '</label>
23
  <input type="text" placeholder="AMP" value="'.esc_attr($amp_query_variable_val).'" name="'.esc_attr($amp_query_variable).'" class="hidden"/>
24
- <label for="search-text-'.esc_attr($rand).'"></label>
25
  <input id="search-text-'.esc_attr($rand).'" type="text" placeholder="'.esc_attr($placeholder).'" value="' . esc_attr(get_search_query()) . '" name="s" class="s" />
26
  <label aria-label="Submit amp search" for="amp-search-submit" >
27
  <input type="submit" class="icon-search" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
21
  <div class="amp-search-wrapper">
22
  <label aria-label="Type your query" class="screen-reader-text" for="s">' . esc_html__($label,'accelerated-mobile-pages') . '</label>
23
  <input type="text" placeholder="AMP" value="'.esc_attr($amp_query_variable_val).'" name="'.esc_attr($amp_query_variable).'" class="hidden"/>
24
+ <label aria-label="search text" for="search-text-'.esc_attr($rand).'"></label>
25
  <input id="search-text-'.esc_attr($rand).'" type="text" placeholder="'.esc_attr($placeholder).'" value="' . esc_attr(get_search_query()) . '" name="s" class="s" />
26
  <label aria-label="Submit amp search" for="amp-search-submit" >
27
  <input type="submit" class="icon-search" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
images/wpquads-logo.png ADDED
Binary file
includes/admin-script.js CHANGED
@@ -2592,4 +2592,12 @@ $("#subscribe-newsletter-form").on('submit',function(e){
2592
  var checkBoxes = $(this).children('input:radio')
2593
  checkBoxes.prop("checked", "true");
2594
  });
 
 
 
 
 
 
 
 
2595
  });
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',
2598
+ };
2599
+ $.post(ajaxurl, data, function(response) {
2600
+ $(".ampforwp_remove_notice").remove();
2601
+ });
2602
+ });
2603
  });
includes/features/advertisement/ads-options.php CHANGED
@@ -7,7 +7,74 @@ if ( ! defined( 'ABSPATH' ) ) {
7
  $advertisementdesc = '';
8
  if(!is_plugin_active( 'amp-incontent-ads/amptoolkit-incontent-ads.php' ) && !is_plugin_active( 'ads-for-wp/ads-for-wp.php' ) ){
9
  $AD_URL = "http://ampforwp.com/advanced-amp-ads/#utm_source=options-panel&utm_medium=advertisement-tab&utm_campaign=AMP%20Plugin";
10
- $advertisementdesc = '<a href="'.$AD_URL.'" target="_blank"><img class="ampforwp-ad-img-banner" src="'.AMPFORWP_IMAGE_DIR . '/amp-ads-retina.png" width="560" height="85" /></a>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  }
12
  // ADS SECTION
13
  Redux::setSection( $opt_name, array(
7
  $advertisementdesc = '';
8
  if(!is_plugin_active( 'amp-incontent-ads/amptoolkit-incontent-ads.php' ) && !is_plugin_active( 'ads-for-wp/ads-for-wp.php' ) ){
9
  $AD_URL = "http://ampforwp.com/advanced-amp-ads/#utm_source=options-panel&utm_medium=advertisement-tab&utm_campaign=AMP%20Plugin";
10
+ $quads_download = '';
11
+ if(function_exists('quads_loaded')){
12
+ $quads_download = '<a href="'.esc_url(admin_url('admin.php?page=quads-settings')).'">'.esc_html__('Go to WP QUADS Settings', 'accelerated-mobile-pages').' </a>';
13
+ }else{
14
+ $quads_download = '<div class="install-now ampforwp-activation-call-module-upgrade button quads_install_button " id="ampforwp-wp-quads-activation-call" data-secure="'.wp_create_nonce('verify_module').'">'.esc_html__('Install Free Plugin', 'accelerated-mobile-pages').'</div>';
15
+ }
16
+ if(file_exists(AMPFORWP_MAIN_PLUGIN_DIR."quick-adsense-reloaded/quick-adsense-reloaded.php") && !function_exists('quads_loaded')){
17
+ $quads_download = '<div class="install-now button quads_install_button"><a target="_blank" href="'.esc_url(admin_url('plugins.php')).'">'.esc_html__('Activate Plugin', 'accelerated-mobile-pages').'</a></div>';
18
+ }
19
+ $advertisementdesc = '
20
+ <div class="ads-baner">
21
+ <span class="adt-top">'.esc_html__('The Best AMP integration for Advertisement', 'accelerated-mobile-pages').'</span>
22
+ <div class="ads-baner-inner">
23
+ <span>'.esc_html__('INTRODUCING', 'accelerated-mobile-pages').'</span>
24
+ <img class="ampforwp-quads-logo" src="'.AMPFORWP_IMAGE_DIR . '/wpquads-logo.png" width="180" height="42" />
25
+ <div class="list-of-feat">
26
+ <ul>
27
+ <li>
28
+ <h5>'.esc_html__('GENERAL FEATURES', 'accelerated-mobile-pages').'</h5>
29
+ <ul class="inner-list">
30
+ <li>'.esc_html__('Unlimited Ads', 'accelerated-mobile-pages').'</li>
31
+ <li>'.esc_html__('Ad after X paragraph', 'accelerated-mobile-pages').'</li>
32
+ <li>'.esc_html__('After every Nth para', 'accelerated-mobile-pages').'</li>
33
+ <li>'.esc_html__('For AMP & non-AMP', 'accelerated-mobile-pages').'</li>
34
+ <li>'.esc_html__('Ad after Imaget', 'accelerated-mobile-pages').'</li>
35
+ <li>'.esc_html__('Ad by Word count', 'accelerated-mobile-pages').'</li>
36
+ </ul>
37
+ </li>
38
+ <li>
39
+ <h5>'.esc_html__('VENDORS', 'accelerated-mobile-pages').'</h5>
40
+ <ul class="inner-list">
41
+ <li>'.esc_html__('Adsense', 'accelerated-mobile-pages').'</li>
42
+ <li>'.esc_html__('Ad manager (DFP)', 'accelerated-mobile-pages').'</li>
43
+ <li>'.esc_html__('Yandex Direct', 'accelerated-mobile-pages').'</li>
44
+ <li>'.esc_html__('Custom Code', 'accelerated-mobile-pages').'</li>
45
+ <li>'.esc_html__('MGID', 'accelerated-mobile-pages').'</li>
46
+ <li>'.esc_html__('30+ coming soon', 'accelerated-mobile-pages').'</li>
47
+ </ul>
48
+ </li>
49
+ <li>
50
+ <h5>'.esc_html__('VISIBILITY by', 'accelerated-mobile-pages').'</h5>
51
+ <ul class="inner-list">
52
+ <li>'.esc_html__('Post Type', 'accelerated-mobile-pages').'</li>
53
+ <li>'.esc_html__('Specific Post', 'accelerated-mobile-pages').'</li>
54
+ <li>'.esc_html__('Taxonomy', 'accelerated-mobile-pages').'</li>
55
+ <li>'.esc_html__('Page Template', 'accelerated-mobile-pages').'</li>
56
+ <li>'.esc_html__('Category / Tag', 'accelerated-mobile-pages').'</li>
57
+ <li>'.esc_html__('And 8+ more', 'accelerated-mobile-pages').'</li>
58
+ </ul>
59
+ </li>
60
+ <li>
61
+ <h5>'.esc_html__('TARGETTING by', 'accelerated-mobile-pages').'</h5>
62
+ <ul class="inner-list">
63
+ <li>'.esc_html__('Device type', 'accelerated-mobile-pages').'</li>
64
+ <li>'.esc_html__('User Agent', 'accelerated-mobile-pages').'</li>
65
+ <li>'.esc_html__('Cookie', 'accelerated-mobile-pages').'</li>
66
+ <li>'.esc_html__('Referre', 'accelerated-mobile-pages').'</li>
67
+ <li>'.esc_html__('Language', 'accelerated-mobile-pages').'</li>
68
+ <li>'.esc_html__('And 4+ more', 'accelerated-mobile-pages').'</li>
69
+ </ul>
70
+ </li>
71
+ </ul>
72
+ <div class="ad-lnk">
73
+ '. $quads_download .'
74
+ </div>
75
+ </div>
76
+ </div>
77
+ </div>';
78
  }
79
  // ADS SECTION
80
  Redux::setSection( $opt_name, array(
includes/features/analytics/analytics-functions.php CHANGED
@@ -367,6 +367,7 @@ add_action( 'ampforwp_body_beginning', 'ampforwp_add_advance_gtm_fields' );
367
  function ampforwp_add_advance_gtm_fields( $ampforwp_adv_gtm_fields ) {
368
  if(true == ampforwp_get_setting('amp-use-gtm-option')){
369
  $gtm_id = ampforwp_get_setting('amp-gtm-id');
 
370
  if(true == ampforwp_get_setting('ampforwp-gtm-field-advance-switch') ){
371
  $ampforwp_adv_gtm_fields = "";
372
  $ampforwp_adv_gtm_fields = ampforwp_get_setting('ampforwp-gtm-field-advance');
@@ -377,9 +378,12 @@ function ampforwp_add_advance_gtm_fields( $ampforwp_adv_gtm_fields ) {
377
  <amp-analytics config="https://www.googletagmanager.com/amp.json?id=<?php echo esc_attr($gtm_id);?>" <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>><script type="application/json"><?php echo sanitize_text_field($ampforwp_adv_gtm_fields) ?></script></amp-analytics> <?php
378
  }
379
  }else{
380
- if($gtm_id!=""){?>
381
  <amp-analytics config="https://www.googletagmanager.com/amp.json?id=<?php echo esc_attr($gtm_id);?>" <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>></amp-analytics> <?php
382
  }
 
 
 
383
  }
384
  }
385
  }
367
  function ampforwp_add_advance_gtm_fields( $ampforwp_adv_gtm_fields ) {
368
  if(true == ampforwp_get_setting('amp-use-gtm-option')){
369
  $gtm_id = ampforwp_get_setting('amp-gtm-id');
370
+ $gtm_analytics = ampforwp_get_setting('amp-gtm-analytics-code');
371
  if(true == ampforwp_get_setting('ampforwp-gtm-field-advance-switch') ){
372
  $ampforwp_adv_gtm_fields = "";
373
  $ampforwp_adv_gtm_fields = ampforwp_get_setting('ampforwp-gtm-field-advance');
378
  <amp-analytics config="https://www.googletagmanager.com/amp.json?id=<?php echo esc_attr($gtm_id);?>" <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>><script type="application/json"><?php echo sanitize_text_field($ampforwp_adv_gtm_fields) ?></script></amp-analytics> <?php
379
  }
380
  }else{
381
+ if($gtm_id!="" && empty($gtm_analytics)){ ?>
382
  <amp-analytics config="https://www.googletagmanager.com/amp.json?id=<?php echo esc_attr($gtm_id);?>" <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>></amp-analytics> <?php
383
  }
384
+ if($gtm_id!="" && !empty($gtm_analytics)){ ?>
385
+ <amp-analytics config="https://www.googletagmanager.com/amp.json?id=<?php echo esc_attr($gtm_id);?>" <?php if(ampforwp_get_data_consent()){?>data-block-on-consent <?php } ?>data-credentials="include"><script type="application/json">{ "vars": { "account": "<?php echo esc_html($gtm_analytics);?>"} }</script></amp-analytics>
386
+ <?php }
387
  }
388
  }
389
  }
includes/features/analytics/analytics-options.php CHANGED
@@ -163,7 +163,7 @@ function ampforwp_analytics_options($opt_name){
163
  ),
164
  ),
165
  array(
166
- 'class'=>'hide',
167
  'id' =>'amp-gtm-analytics-code',
168
  'type' => 'text',
169
  'title' => esc_html__('Analytics ID','accelerated-mobile-pages'),
163
  ),
164
  ),
165
  array(
166
+ 'class'=>'child_opt child_opt_arrow',
167
  'id' =>'amp-gtm-analytics-code',
168
  'type' => 'text',
169
  'title' => esc_html__('Analytics ID','accelerated-mobile-pages'),
includes/features/functions.php CHANGED
@@ -54,6 +54,7 @@ function ampforwp_add_admin_styling($hook_suffix){
54
  add_action('admin_notices', 'ampforwp_seo_selection_notice' );
55
  add_action('admin_notices', 'ampforwp_mobile_redirection_notice' );
56
  add_action('admin_notices', 'ampforwp_category_base_remove_notice' );
 
57
  }else{
58
  $redux_data['ampforwp-amp-takeover'] = ampforwp_get_setting('ampforwp-amp-takeover');
59
  }
@@ -85,7 +86,7 @@ function ampforwp_add_admin_styling($hook_suffix){
85
  // 96. ampforwp_is_front_page() ampforwp_is_home() and ampforwp_is_blog is created
86
  function ampforwp_is_front_page(){
87
  global $redux_builder_amp;
88
-
89
  // Reading settings me frontpage set
90
  $get_front_page_reading_settings = get_option('page_on_front');
91
 
@@ -107,22 +108,25 @@ function ampforwp_is_front_page(){
107
  }
108
  // TRUE: When we have "Your latest posts" in reading settings and custom frontpage in amp
109
  if ( 'posts' == get_option( 'show_on_front') && is_home() && $get_amp_homepage_settings && $get_custom_frontpage_settings)
110
- return true;
111
 
112
  // TRUE: When we have " A static page" in reading settings and custom frontpage in amp
113
  if ( 'page' == get_option( 'show_on_front') && (is_home() || is_front_page()) && $get_front_page_reading_settings && $get_amp_homepage_settings && $get_custom_frontpage_settings && !empty($get_amp_custom_frontpage_id)) {
114
 
 
 
115
  $current_page = get_queried_object();
116
  if ( $current_page ) {
117
  $current_page = $current_page->ID;
118
  }
119
  if ( get_option( 'page_for_posts') == $current_page ) {
120
- return false ;
121
  }
122
- return true;
123
  }
124
 
125
- return false ;
 
126
 
127
  }
128
 
@@ -1281,9 +1285,6 @@ function ampforwp_dev_mode_notice(){
1281
  }
1282
 
1283
  function ampforwp_seo_selection_notice() {
1284
- if('' != ampforwp_get_setting('ampforwp-seo-selection')){
1285
- return;
1286
- }
1287
  $seo = '';
1288
  if(class_exists('WPSEO_Options')){
1289
  $seo = 'Yoast SEO';
@@ -1312,8 +1313,44 @@ function ampforwp_seo_selection_notice() {
1312
  if(function_exists('seopress_activation')){
1313
  $seo = 'SEO Press';
1314
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1315
  if(!empty($seo)){
1316
- echo sprintf(('<div class="notice notice-error"><p>%s <a href="%s">%s</a></p></div>'), esc_html__('The configuration of AMPforWP and '.esc_html($seo).' plugin is seems incorrect. Please go to AMPforWP plugin settings and select '.esc_html($seo).' from SEO Plugin Integration or ','accelerated-mobile-pages'),esc_url(admin_url('admin.php?page=amp_options&tab=5')),esc_html__('Click Here','accelerated-mobile-pages'));
1317
  }
1318
  }
1319
  add_action('wp_ajax_ampforwp_subscribe_newsletter','ampforwp_subscribe_for_newsletter');
@@ -1398,4 +1435,34 @@ function ampforwp_get_taxonomy_meta($term_id,$type=''){
1398
  }
1399
  return true;
1400
  }
1401
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
54
  add_action('admin_notices', 'ampforwp_seo_selection_notice' );
55
  add_action('admin_notices', 'ampforwp_mobile_redirection_notice' );
56
  add_action('admin_notices', 'ampforwp_category_base_remove_notice' );
57
+ add_action('admin_notices', 'ampforwp_internal_feedback_notice' );
58
  }else{
59
  $redux_data['ampforwp-amp-takeover'] = ampforwp_get_setting('ampforwp-amp-takeover');
60
  }
86
  // 96. ampforwp_is_front_page() ampforwp_is_home() and ampforwp_is_blog is created
87
  function ampforwp_is_front_page(){
88
  global $redux_builder_amp;
89
+ $front_page = false;
90
  // Reading settings me frontpage set
91
  $get_front_page_reading_settings = get_option('page_on_front');
92
 
108
  }
109
  // TRUE: When we have "Your latest posts" in reading settings and custom frontpage in amp
110
  if ( 'posts' == get_option( 'show_on_front') && is_home() && $get_amp_homepage_settings && $get_custom_frontpage_settings)
111
+ $front_page = true;
112
 
113
  // TRUE: When we have " A static page" in reading settings and custom frontpage in amp
114
  if ( 'page' == get_option( 'show_on_front') && (is_home() || is_front_page()) && $get_front_page_reading_settings && $get_amp_homepage_settings && $get_custom_frontpage_settings && !empty($get_amp_custom_frontpage_id)) {
115
 
116
+ $front_page = true;
117
+
118
  $current_page = get_queried_object();
119
  if ( $current_page ) {
120
  $current_page = $current_page->ID;
121
  }
122
  if ( get_option( 'page_for_posts') == $current_page ) {
123
+ $front_page = false ;
124
  }
125
+
126
  }
127
 
128
+ $front_page = apply_filters('ampforwp_is_front_page', $front_page);
129
+ return $front_page;
130
 
131
  }
132
 
1285
  }
1286
 
1287
  function ampforwp_seo_selection_notice() {
 
 
 
1288
  $seo = '';
1289
  if(class_exists('WPSEO_Options')){
1290
  $seo = 'Yoast SEO';
1313
  if(function_exists('seopress_activation')){
1314
  $seo = 'SEO Press';
1315
  }
1316
+ $seosel = false;
1317
+ if(class_exists('WPSEO_Options') && 'yoast' != ampforwp_get_setting('ampforwp-seo-selection')){
1318
+ $seosel = true;
1319
+ }
1320
+ else if (defined( 'RANK_MATH_FILE' ) && 'rank_math' != ampforwp_get_setting('ampforwp-seo-selection')){
1321
+ $seosel = true;
1322
+ }
1323
+ else if (class_exists('All_in_One_SEO_Pack') && 'aioseo' != ampforwp_get_setting('ampforwp-seo-selection')){
1324
+ $seosel = true;
1325
+ }
1326
+ else if (function_exists( 'the_seo_framework' ) && 'seo_framework' != ampforwp_get_setting('ampforwp-seo-selection')){
1327
+ $seosel = true;
1328
+ }
1329
+ else if (defined( 'SQ_ALL_PATTERNS' ) && 'squirrly' != ampforwp_get_setting('ampforwp-seo-selection')){
1330
+ $seosel = true;
1331
+ }
1332
+ else if (class_exists('Smartcrawl_Loader') && 'smartcrawl' != ampforwp_get_setting('ampforwp-seo-selection')){
1333
+ $seosel = true;
1334
+ }
1335
+ else if (function_exists('genesis_theme_support') && 'genesis' != ampforwp_get_setting('ampforwp-seo-selection')){
1336
+ $seosel = true;
1337
+ }
1338
+ else if (function_exists('seopress_activation') && 'seopress' != ampforwp_get_setting('ampforwp-seo-selection')){
1339
+ $seosel = true;
1340
+ }
1341
+ else if (function_exists('qode_header_meta') && 'bridge' != ampforwp_get_setting('ampforwp-seo-selection')){
1342
+ $seosel = true;
1343
+ }
1344
+ if($seosel && ( '' != ampforwp_get_setting('ampforwp-seo-selection') ) ){
1345
+ echo sprintf(('<div class="notice notice-error"><p>%s</p></div>'), esc_html__('Incorrect SEO plugin has been selected in AMPforWP SEO Settings, Please select '.esc_html($seo).' from SEO Settings.','accelerated-mobile-pages'));
1346
+ }
1347
+
1348
+ if('' != ampforwp_get_setting('ampforwp-seo-selection')){
1349
+ return;
1350
+ }
1351
+
1352
  if(!empty($seo)){
1353
+ echo sprintf(('<div class="notice notice-error"><p>%s </p></div>'), esc_html__('The configuration of AMPforWP and '.esc_html($seo).' plugin is seems incorrect. Please go to AMPforWP plugin settings -> SEO -> SEO Plugin Integration and select '.esc_html($seo).' plugin from the drop down.','accelerated-mobile-pages'));
1354
  }
1355
  }
1356
  add_action('wp_ajax_ampforwp_subscribe_newsletter','ampforwp_subscribe_for_newsletter');
1435
  }
1436
  return true;
1437
  }
1438
+ }
1439
+
1440
+ function ampforwp_internal_feedback_notice(){
1441
+ $install_date = get_option('ampforwp_plugin_info');
1442
+ if (isset($install_date["activation_data"])) {
1443
+ $install_date = $install_date["activation_data"];
1444
+ $install_date = date("m-d-Y", $install_date);
1445
+ }
1446
+ $activation_never = get_option("ampforwp_feedback_remove_notice");
1447
+ if (strtotime($install_date) < strtotime('1 month ago') && $activation_never !='remove') {?>
1448
+ <div class="updated notice ampforwp_remove_notice" style="box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);background-color:white;">
1449
+ <p>
1450
+ <?php esc_html_e('Awesome, you\'ve been using AMPforWP for more than 1 month. May I ask you to give it a 5-star rating on WordPress.org?', 'accelerated-mobile-pages'); ?></br>
1451
+ <?php esc_html_e('This will help spread the word out about this plugin and will encourage us to continue the development.', 'accelerated-mobile-pages'); ?></br>
1452
+ <?php esc_html_e('Much appreciated, thank you very much.', 'accelerated-mobile-pages'); ?></br></br>
1453
+ <a href="https://wordpress.org/support/plugin/accelerated-mobile-pages/reviews/?rate=5#new-post" class="button-primary" target="_new" style="font-weight:bold;" title="Ok, you deserved it"> <?php echo esc_html__('Ok, You deserve it', 'accelerated-mobile-pages') ?></a>
1454
+ <a class="button-primary" id="ampforwp-close-notice" style="font-weight:bold;"><?php echo esc_html__('Not Now', 'accelerated-mobile-pages') ?></a>
1455
+ </p>
1456
+ </div>
1457
+ <?php }
1458
+ }
1459
+ function ampforwp_feedback_remove_notice(){
1460
+ $result = update_option( "ampforwp_feedback_remove_notice", 'remove');
1461
+ if($result){
1462
+ echo json_encode(array('status'=>'t'));
1463
+ }else{
1464
+ echo json_encode(array('status'=>'f'));
1465
+ }
1466
+ wp_die();
1467
+ }
1468
+ add_action('wp_ajax_ampforwp_feedback_remove_notice', 'ampforwp_feedback_remove_notice');
includes/module-upgrade.js CHANGED
@@ -18,6 +18,8 @@ jQuery(document).ready(function($){
18
  activate = '&activate=adsforwp';
19
  adsforwp_is_active = $(".ampforwp-activation-url").attr('id');
20
  adsforwp_act_url = $(".ampforwp-activation-url").val();
 
 
21
  }
22
  self.text( wp.updates.l10n.installing );
23
  $.ajax({
@@ -109,6 +111,10 @@ jQuery(document).ready(function($){
109
  self.removeClass('ampforwp-activation-call-module-upgrade');
110
  }
111
  });
 
 
 
 
112
  }
113
  },
114
  error: function (jqXHR, exception) {
18
  activate = '&activate=adsforwp';
19
  adsforwp_is_active = $(".ampforwp-activation-url").attr('id');
20
  adsforwp_act_url = $(".ampforwp-activation-url").val();
21
+ }else if(currentId=='ampforwp-wp-quads-activation-call'){
22
+ activate = '&activate=wp_quads';
23
  }
24
  self.text( wp.updates.l10n.installing );
25
  $.ajax({
111
  self.removeClass('ampforwp-activation-call-module-upgrade');
112
  }
113
  });
114
+ }else if(self.attr('id')=='ampforwp-wp-quads-activation-call'){
115
+ msgplug = 'WP QUADS';
116
+ self.html('<a href="'+response.redirect_url+'">Installed! - Let\'s Go to '+msgplug+' Settings</a>')
117
+ self.removeClass('ampforwp-activation-call-module-upgrade');
118
  }
119
  },
120
  error: function (jqXHR, exception) {
includes/modules-upgrade.php CHANGED
@@ -89,6 +89,25 @@ function ampforwp_enable_modules_upgread(){
89
  );
90
  $redirectSettingsUrl = admin_url('edit.php?post_type=adsforwp');
91
  break;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
92
  default:
93
  $plugins = array();
94
  break;
89
  );
90
  $redirectSettingsUrl = admin_url('edit.php?post_type=adsforwp');
91
  break;
92
+ case 'wp_quads':
93
+ $nonceUrl = add_query_arg(
94
+ array(
95
+ 'action' => 'activate',
96
+ 'plugin' => 'quick-adsense-reloaded',
97
+ 'plugin_status' => 'all',
98
+ 'paged' => '1',
99
+ '_wpnonce' => wp_create_nonce( 'activate-plugin_quick-adsense-reloaded' ),
100
+ ),
101
+ esc_url(network_admin_url( 'plugins.php' ))
102
+ );
103
+ $plugins[] = array(
104
+ 'name' => 'quick-adsense-reloaded',
105
+ 'path_' => 'https://downloads.wordpress.org/plugin/quick-adsense-reloaded.zip',
106
+ 'path' => $nonceUrl,
107
+ 'install' => 'quick-adsense-reloaded/quick-adsense-reloaded.php',
108
+ );
109
+ $redirectSettingsUrl = admin_url('admin.php?page=quads-settings');
110
+ break;
111
  default:
112
  $plugins = array();
113
  break;
includes/options/admin-config.php CHANGED
@@ -4648,7 +4648,7 @@ Redux::setSection( $opt_name, array(
4648
  'type' => 'color_rgba',
4649
  'title' => esc_html__('Header Background','accelerated-mobile-pages'),
4650
  'default' => array(
4651
- 'color' => '#0a89c0',
4652
  ),
4653
  'required' => array(
4654
  array('amp-design-selector', '=' , '1')
@@ -4671,7 +4671,7 @@ Redux::setSection( $opt_name, array(
4671
  'type' => 'color_rgba',
4672
  'title' => esc_html__('Header Background','accelerated-mobile-pages'),
4673
  'default' => array(
4674
- 'color' => '#0a89c0',
4675
  ),
4676
  'required' => array(
4677
  array('amp-design-selector', '=' , '2')
@@ -5270,6 +5270,7 @@ Redux::setSection( $opt_name, array(
5270
  $ampforwp_home_loop = get_option('ampforwp_custom_post_types');
5271
  $ampforwp_home_loop['post'] = 'Posts';
5272
  unset($ampforwp_home_loop['page']);
 
5273
 
5274
  // HomePage Section
5275
  Redux::setSection( $opt_name, array(
@@ -5518,6 +5519,7 @@ Redux::setSection( $opt_name, array(
5518
  array(
5519
  'id' => 'ampforwp-homepage-loop-type',
5520
  'type' => 'select',
 
5521
  'title' => esc_html__( 'Post Type in Loop', 'accelerated-mobile-pages' ),
5522
  'options' => $ampforwp_home_loop,
5523
  'default' => 'post',
@@ -5709,7 +5711,7 @@ $single_page_options = array(
5709
  'required' => array(
5710
  array('amp-design-selector', '=' , '4'),
5711
  array('swift-featued-image', '=' , '1'),
5712
- array('rp_design_type', '=' , '1')
5713
  ),
5714
  ),
5715
  array(
@@ -6803,7 +6805,7 @@ else{
6803
  'type' => 'color_rgba',
6804
  'title' => esc_html__('Footer Link Color', 'accelerated-mobile-pages'),
6805
  'default' => array(
6806
- 'color' => '#0a89c0'
6807
  ),
6808
  'required' => array(
6809
  array('amp-design-selector', '=' , '1')
@@ -6881,7 +6883,7 @@ else{
6881
  'type' => 'color_rgba',
6882
  'title' => esc_html__('Footer Link Color', 'accelerated-mobile-pages'),
6883
  'default' => array(
6884
- 'color' => '#0a89c0'
6885
  ),
6886
  'required' => array(
6887
  array('amp-design-selector', '=' , '2')
@@ -6970,7 +6972,7 @@ else{
6970
  'type' => 'color_rgba',
6971
  'title' => esc_html__('Footer Powered by Color', 'accelerated-mobile-pages'),
6972
  'default' => array(
6973
- 'color' => '#666666'
6974
  ),
6975
  'required' => array(
6976
  array('amp-design-selector', '=' , '3')
4648
  'type' => 'color_rgba',
4649
  'title' => esc_html__('Header Background','accelerated-mobile-pages'),
4650
  'default' => array(
4651
+ 'color' => '#04415D',
4652
  ),
4653
  'required' => array(
4654
  array('amp-design-selector', '=' , '1')
4671
  'type' => 'color_rgba',
4672
  'title' => esc_html__('Header Background','accelerated-mobile-pages'),
4673
  'default' => array(
4674
+ 'color' => '#0074A7',
4675
  ),
4676
  'required' => array(
4677
  array('amp-design-selector', '=' , '2')
5270
  $ampforwp_home_loop = get_option('ampforwp_custom_post_types');
5271
  $ampforwp_home_loop['post'] = 'Posts';
5272
  unset($ampforwp_home_loop['page']);
5273
+ unset($ampforwp_home_loop['category']);
5274
 
5275
  // HomePage Section
5276
  Redux::setSection( $opt_name, array(
5519
  array(
5520
  'id' => 'ampforwp-homepage-loop-type',
5521
  'type' => 'select',
5522
+ 'multi' => true,
5523
  'title' => esc_html__( 'Post Type in Loop', 'accelerated-mobile-pages' ),
5524
  'options' => $ampforwp_home_loop,
5525
  'default' => 'post',
5711
  'required' => array(
5712
  array('amp-design-selector', '=' , '4'),
5713
  array('swift-featued-image', '=' , '1'),
5714
+ array('single-design-type', '=' , '1')
5715
  ),
5716
  ),
5717
  array(
6805
  'type' => 'color_rgba',
6806
  'title' => esc_html__('Footer Link Color', 'accelerated-mobile-pages'),
6807
  'default' => array(
6808
+ 'color' => '#04415D'
6809
  ),
6810
  'required' => array(
6811
  array('amp-design-selector', '=' , '1')
6883
  'type' => 'color_rgba',
6884
  'title' => esc_html__('Footer Link Color', 'accelerated-mobile-pages'),
6885
  'default' => array(
6886
+ 'color' => '#0074A7'
6887
  ),
6888
  'required' => array(
6889
  array('amp-design-selector', '=' , '2')
6972
  'type' => 'color_rgba',
6973
  'title' => esc_html__('Footer Powered by Color', 'accelerated-mobile-pages'),
6974
  'default' => array(
6975
+ 'color' => '#cac8c8'
6976
  ),
6977
  'required' => array(
6978
  array('amp-design-selector', '=' , '3')
includes/options/redux-core/assets/css/redux-admin.css CHANGED
@@ -1415,4 +1415,106 @@ fieldset#redux_builder_amp-AMPforWP_cache_mode .description.field-desc {
1415
  grid-gap: 10px;
1416
  }
1417
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1418
  }
1415
  grid-gap: 10px;
1416
  }
1417
 
1418
+ }
1419
+ /** New Ads Banner CSS **/
1420
+ .amp-ads a{
1421
+ text-decoration: none;
1422
+ }
1423
+ .ads-baner{
1424
+ border: 1px solid #2196F3;
1425
+ width: 100%;
1426
+ display: inline-block;
1427
+ box-sizing: border-box;
1428
+ border-radius: 3px;
1429
+ }
1430
+ .ads-baner span.adt-top{
1431
+ background: #087fde;
1432
+ padding: 10px 0px 10px 15px;
1433
+ display: inline-block;
1434
+ width: 100%;
1435
+ box-sizing: border-box;
1436
+ color: #fff;
1437
+ font-size: 13px;
1438
+ font-weight: 500;
1439
+ }
1440
+ .ads-baner-inner{
1441
+ padding:10px;
1442
+ }
1443
+ .ads-baner-inner span{
1444
+ text-align: center;
1445
+ width: 100%;
1446
+ display: inline-block;
1447
+ letter-spacing: 5px;
1448
+ color: #03A9F4;
1449
+ font-size: 13px;
1450
+ }
1451
+ img.ampforwp-quads-logo{
1452
+ max-width: 180px;
1453
+ height: 42px;
1454
+ margin: 10px auto 0 auto;
1455
+ display: inherit;
1456
+ }
1457
+ .list-of-feat{
1458
+ padding:15px 10px;
1459
+ }
1460
+ .list-of-feat h5{
1461
+ font-size: 14px;
1462
+ color: #333;
1463
+ font-weight: bold;
1464
+ margin:0px;
1465
+ }
1466
+ .inner-list{
1467
+ padding: 14px 0px 10px 0px;
1468
+ font-size: 15px;
1469
+ font-weight: 500;
1470
+ color: #666;
1471
+ }
1472
+ .inner-list li{
1473
+ margin-bottom: 14px !important;
1474
+ }
1475
+ .inner-list li:before{
1476
+ content: "";
1477
+ display: inline-block;
1478
+ transform: rotate(40deg);
1479
+ height: 8px;
1480
+ width: 4px;
1481
+ border-bottom: 2px solid #4CAF50;
1482
+ border-right: 2px solid #4CAF50;
1483
+ margin-right: 10px;
1484
+ }
1485
+ .list-of-feat > ul{
1486
+ display:inline-grid;
1487
+ grid-template-columns: 1fr 1fr 180px 140px;
1488
+ width:100%;
1489
+ grid-gap:0px 20px;
1490
+ }
1491
+ .ad-lnk{
1492
+ width: 100%;
1493
+ display: inline-block;
1494
+ margin: 10px auto 15px auto;
1495
+ text-align: center;
1496
+ }
1497
+ .ad-lnk a,.ad-lnk .quads_install_button,.ad-lnk .quads_install_button:hover{
1498
+ background: #087fde;
1499
+ padding: 10px 35px 10px 35px;
1500
+ font-size: 16px;
1501
+ line-height: 1.2;
1502
+ color: #fff;
1503
+ font-weight: 600;
1504
+ border-radius: 30px;
1505
+ }
1506
+ .button.installed:before, .button.installing:before, .button.updated-message:before, .button.updating-message:before {
1507
+ margin: 0px 7px 2px -2px;
1508
+ color: #fff;
1509
+ }
1510
+ div#section-amp-ads_1, table#section-table-amp-ads_1 {
1511
+ max-width: 100% !important;
1512
+ }
1513
+ div#section-ampforwp-ads-section, table#section-table-ampforwp-ads-section{
1514
+ display:none !important;
1515
+ }
1516
+ @media(max-width:768px){
1517
+ .list-of-feat > ul {
1518
+ grid-template-columns: 1fr 1fr;
1519
+ }
1520
  }
includes/options/redux-core/inc/fields/multi_text/field_multi_text.js CHANGED
@@ -33,7 +33,7 @@
33
  } else {
34
  return;
35
  }
36
- el.find( '.redux-multi-text-remove' ).live(
37
  'click', function() {
38
  redux_change( $( this ) );
39
  $( this ).prev( 'input[type="text"]' ).val( '' );
33
  } else {
34
  return;
35
  }
36
+ el.find( '.redux-multi-text-remove' ).on(
37
  'click', function() {
38
  redux_change( $( this ) );
39
  $( this ).prev( 'input[type="text"]' ).val( '' );
includes/options/redux-core/inc/fields/multi_text/field_multi_text.min.js CHANGED
@@ -1 +1 @@
1
- !function(a){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.multi_text=redux.field_objects.multi_text||{},a(document).ready(function(){}),redux.field_objects.multi_text.init=function(b){b||(b=a(document).find(".redux-container-multi_text:visible")),a(b).each(function(){var b=a(this),c=b;b.hasClass("redux-field-container")||(c=b.parents(".redux-field-container:first")),c.is(":hidden")||c.hasClass("redux-field-init")&&(c.removeClass("redux-field-init"),b.find(".redux-multi-text-remove").live("click",function(){redux_change(a(this)),a(this).prev('input[type="text"]').val(""),a(this).parent().slideUp("medium",function(){a(this).remove()})}),b.find(".redux-multi-text-add").click(function(){for(var c=parseInt(a(this).attr("data-add_number")),d=a(this).attr("data-id"),e=a(this).attr("data-name"),f=0;c>f;f++){var g=a("#"+d+" li:last-child").clone();b.find("#"+d).append(g),b.find("#"+d+" li:last-child").removeAttr("style"),b.find("#"+d+' li:last-child input[type="text"]').val(""),b.find("#"+d+' li:last-child input[type="text"]').attr("name",e)}}))})}}(jQuery);
1
+ !function(a){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.multi_text=redux.field_objects.multi_text||{},a(document).ready(function(){}),redux.field_objects.multi_text.init=function(b){b||(b=a(document).find(".redux-container-multi_text:visible")),a(b).each(function(){var b=a(this),c=b;b.hasClass("redux-field-container")||(c=b.parents(".redux-field-container:first")),c.is(":hidden")||c.hasClass("redux-field-init")&&(c.removeClass("redux-field-init"),b.find(".redux-multi-text-remove").on("click",function(){redux_change(a(this)),a(this).prev('input[type="text"]').val(""),a(this).parent().slideUp("medium",function(){a(this).remove()})}),b.find(".redux-multi-text-add").click(function(){for(var c=parseInt(a(this).attr("data-add_number")),d=a(this).attr("data-id"),e=a(this).attr("data-name"),f=0;c>f;f++){var g=a("#"+d+" li:last-child").clone();b.find("#"+d).append(g),b.find("#"+d+" li:last-child").removeAttr("style"),b.find("#"+d+' li:last-child input[type="text"]').val(""),b.find("#"+d+' li:last-child input[type="text"]').attr("name",e)}}))})}}(jQuery);
includes/options/redux-core/inc/fields/multitext_repeater/field_multitext_repeater.js CHANGED
@@ -33,7 +33,7 @@
33
  } else {
34
  return;
35
  }
36
- el.find( '.redux-multitext_repeater-remove' ).live(
37
  'click', function() {
38
  redux_change( $( this ) );
39
  $( this ).prev( 'input[type="text"]' ).val( '' );
33
  } else {
34
  return;
35
  }
36
+ el.find( '.redux-multitext_repeater-remove' ).on(
37
  'click', function() {
38
  redux_change( $( this ) );
39
  $( this ).prev( 'input[type="text"]' ).val( '' );
includes/options/redux-core/inc/fields/multitext_repeater/field_multitext_repeater.min.js CHANGED
@@ -1 +1 @@
1
- !function(e){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.multitext_repeater=redux.field_objects.multitext_repeater||{},e(document).ready(function(){}),redux.field_objects.multitext_repeater.init=function(t){t||(t=e(document).find(".redux-container-multitext_repeater:visible")),e(t).each(function(){var t=e(this),i=t;if(t.hasClass("redux-field-container")||(i=t.parents(".redux-field-container:first")),!i.is(":hidden")&&i.hasClass("redux-field-init")){i.removeClass("redux-field-init"),t.find(".redux-multitext_repeater-remove").live("click",function(){redux_change(e(this)),e(this).prev('input[type="text"]').val(""),e(this).parent().parent().slideUp("medium",function(){e(this).remove(),1==e(".redux-multitext_repeater-remove").length&&e(".redux-multitext_repeater-remove").css({display:"none"})})});t.find(".redux-multitext_show_hide").click(function(){e("#select_goals").removeClass("hide")}),e(document).on("click",".form_select_opt",function(t){t.target.parentNode;e(t.target.parentNode.parentNode).find(".form_select_opt").val(t.target.value);"select"==t.target.value&&e(t.target.parentNode.parentNode).find(".form_sel_div").addClass("hide"),"all_form_submission"==t.target.value&&(e(t.target.parentNode.parentNode).find(".form_sel_div").removeClass("hide"),e(t.target.parentNode.parentNode).find(".main_id_class").addClass("hide")),"specific_form_submission"==t.target.value&&e(t.target.parentNode.parentNode).find(".form_sel_div").removeClass("hide")}),t.find(".redux-multitext_repeater-add").click(function(){var i=parseInt(e(this).attr("data-add_number")),a=e(this).attr("data-id"),s=(e(this).attr("data-name"),e("#form_opt").val());e("#select_goals").addClass("hide");for(var l=0;l<i;l++){var o,n,r,d,m,c=e("#"+a+" li:last-child").clone();m=d=r=n=o="";var p="#";"form_submission"==s?(o="selected",n="Form ID",r="Form Submission",d='<div class="main_form_select"><span>Form Submission Tracking Type</span><select id="amp-conversion-goals-amp-goal-form-type" name="redux_builder_amp[amp-conversion-goals][amp-goal-form-type][select][]" class="indi_option form_select_opt" value=""><option value="select" selected>Select</option><option value="all_form_submission">All Forms</option><option value="specific_form_submission">Specific Forms</option></select></div>',m="hide",p="https://ampforwp.com/tutorials/article/how-to-add-ga-form-submission-tracking-in-amp/"):(d='<div class="main_form_select hide"><span>Form Submission Tracking Type</span><select id="amp-conversion-goals-amp-goal-form-type" name="redux_builder_amp[amp-conversion-goals][amp-goal-form-type][select][]" class="indi_option form_select_opt" value=""><option value="select" selected>Select</option><option value="all_form_submission">All Forms</option><option value="specific_form_submission">Specific Forms</option></select></div>',o="selected",n="Link ID",r="Link Tracking",p="https://ampforwp.com/tutorials/article/how-to-add-ga-link-tracking-in-amp/"),c='<li><span class="tool_tip afw-tooltip"><i class="el el-question-sign "></i><span class="afw-help-subtitle"><a href="'+p+'" target="_blank">Click Here</a> for more details on '+r+'</span></span><div class="element-fields multitext_repeater-fields "><span class="goals-count">Goals #1 '+r+'</span><select style="display:none;" id="amp-conversion-goals-amp-goal-type" name="redux_builder_amp[amp-conversion-goals][amp-goal-type][select][]" class="indi_option" value=""><option value="link_tracking" '+o+'>Link Tracking</option><option value="form_submission" '+o+">Form Submission</option></select>"+d+'<div class="form_sel_div main_id_class '+m+'"><span class="multi-title id_class">'+n+'</span><input type="text" id="amp-conversion-goals-amp-conv-goal-id" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-id][text][]" value="" class="regular-text multi-text" placeholder="Enter Id"></div><div class="form_sel_div '+m+'"><span class="multi-title ">Event Name</span><input type="text" id="amp-conversion-goals-amp-conv-goal-eventname" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-eventname][text][]" value="" class="regular-text multi-text" placeholder="Enter Event Name"></div><div class="form_sel_div '+m+'"><span class="multi-title ">Event Category</span><input type="text" id="amp-conversion-goals-amp-conv-goal-eventcat" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-eventcat][text][]" value="" class="regular-text multi-text" placeholder="Enter Event Category"></div><div class="form_sel_div '+m+'"><span class="multi-title ">Event Action</span><input type="text" id="amp-conversion-goals-amp-conv-goal-event_action" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-event_action][text][]" value="" class="regular-text multi-text" placeholder="Enter Event Action"></div><span class="el el-remove deletion redux-multitext_repeater-remove" style="display:none"></span><div></div></div></li>',t.find("#"+a).append(c),t.find("#"+a+" li:last-child").removeAttr("style");var u=e(".redux-multitext_repeater-remove").length;t.find("#"+a+" li:last-child select").val(s),"form_submission"==s?t.find("#"+a+" li:last-child .id_class").text("Form ID"):t.find("#"+a+" li:last-child .id_class").text("Link ID"),t.find("#"+a+" li:last-child .goals-count").text("Goals #"+u+" "+r),e("#"+a+" li:first-child .resetfields").remove(),e("#"+a+" li .multitext_repeater-fields").removeClass("hide"),t.find("#"+a+" li:last-child .form_select_opt").val("select"),e(".redux-multitext_repeater-remove").removeAttr("style")}})}})}}(jQuery);
1
+ !function(e){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.multitext_repeater=redux.field_objects.multitext_repeater||{},e(document).ready(function(){}),redux.field_objects.multitext_repeater.init=function(t){t||(t=e(document).find(".redux-container-multitext_repeater:visible")),e(t).each(function(){var t=e(this),i=t;if(t.hasClass("redux-field-container")||(i=t.parents(".redux-field-container:first")),!i.is(":hidden")&&i.hasClass("redux-field-init")){i.removeClass("redux-field-init"),t.find(".redux-multitext_repeater-remove").on("click",function(){redux_change(e(this)),e(this).prev('input[type="text"]').val(""),e(this).parent().parent().slideUp("medium",function(){e(this).remove(),1==e(".redux-multitext_repeater-remove").length&&e(".redux-multitext_repeater-remove").css({display:"none"})})});t.find(".redux-multitext_show_hide").click(function(){e("#select_goals").removeClass("hide")}),e(document).on("click",".form_select_opt",function(t){t.target.parentNode;e(t.target.parentNode.parentNode).find(".form_select_opt").val(t.target.value);"select"==t.target.value&&e(t.target.parentNode.parentNode).find(".form_sel_div").addClass("hide"),"all_form_submission"==t.target.value&&(e(t.target.parentNode.parentNode).find(".form_sel_div").removeClass("hide"),e(t.target.parentNode.parentNode).find(".main_id_class").addClass("hide")),"specific_form_submission"==t.target.value&&e(t.target.parentNode.parentNode).find(".form_sel_div").removeClass("hide")}),t.find(".redux-multitext_repeater-add").click(function(){var i=parseInt(e(this).attr("data-add_number")),a=e(this).attr("data-id"),s=(e(this).attr("data-name"),e("#form_opt").val());e("#select_goals").addClass("hide");for(var l=0;l<i;l++){var o,n,r,d,m,c=e("#"+a+" li:last-child").clone();m=d=r=n=o="";var p="#";"form_submission"==s?(o="selected",n="Form ID",r="Form Submission",d='<div class="main_form_select"><span>Form Submission Tracking Type</span><select id="amp-conversion-goals-amp-goal-form-type" name="redux_builder_amp[amp-conversion-goals][amp-goal-form-type][select][]" class="indi_option form_select_opt" value=""><option value="select" selected>Select</option><option value="all_form_submission">All Forms</option><option value="specific_form_submission">Specific Forms</option></select></div>',m="hide",p="https://ampforwp.com/tutorials/article/how-to-add-ga-form-submission-tracking-in-amp/"):(d='<div class="main_form_select hide"><span>Form Submission Tracking Type</span><select id="amp-conversion-goals-amp-goal-form-type" name="redux_builder_amp[amp-conversion-goals][amp-goal-form-type][select][]" class="indi_option form_select_opt" value=""><option value="select" selected>Select</option><option value="all_form_submission">All Forms</option><option value="specific_form_submission">Specific Forms</option></select></div>',o="selected",n="Link ID",r="Link Tracking",p="https://ampforwp.com/tutorials/article/how-to-add-ga-link-tracking-in-amp/"),c='<li><span class="tool_tip afw-tooltip"><i class="el el-question-sign "></i><span class="afw-help-subtitle"><a href="'+p+'" target="_blank">Click Here</a> for more details on '+r+'</span></span><div class="element-fields multitext_repeater-fields "><span class="goals-count">Goals #1 '+r+'</span><select style="display:none;" id="amp-conversion-goals-amp-goal-type" name="redux_builder_amp[amp-conversion-goals][amp-goal-type][select][]" class="indi_option" value=""><option value="link_tracking" '+o+'>Link Tracking</option><option value="form_submission" '+o+">Form Submission</option></select>"+d+'<div class="form_sel_div main_id_class '+m+'"><span class="multi-title id_class">'+n+'</span><input type="text" id="amp-conversion-goals-amp-conv-goal-id" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-id][text][]" value="" class="regular-text multi-text" placeholder="Enter Id"></div><div class="form_sel_div '+m+'"><span class="multi-title ">Event Name</span><input type="text" id="amp-conversion-goals-amp-conv-goal-eventname" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-eventname][text][]" value="" class="regular-text multi-text" placeholder="Enter Event Name"></div><div class="form_sel_div '+m+'"><span class="multi-title ">Event Category</span><input type="text" id="amp-conversion-goals-amp-conv-goal-eventcat" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-eventcat][text][]" value="" class="regular-text multi-text" placeholder="Enter Event Category"></div><div class="form_sel_div '+m+'"><span class="multi-title ">Event Action</span><input type="text" id="amp-conversion-goals-amp-conv-goal-event_action" name="redux_builder_amp[amp-conversion-goals][amp-conv-goal-event_action][text][]" value="" class="regular-text multi-text" placeholder="Enter Event Action"></div><span class="el el-remove deletion redux-multitext_repeater-remove" style="display:none"></span><div></div></div></li>',t.find("#"+a).append(c),t.find("#"+a+" li:last-child").removeAttr("style");var u=e(".redux-multitext_repeater-remove").length;t.find("#"+a+" li:last-child select").val(s),"form_submission"==s?t.find("#"+a+" li:last-child .id_class").text("Form ID"):t.find("#"+a+" li:last-child .id_class").text("Link ID"),t.find("#"+a+" li:last-child .goals-count").text("Goals #"+u+" "+r),e("#"+a+" li:first-child .resetfields").remove(),e("#"+a+" li .multitext_repeater-fields").removeClass("hide"),t.find("#"+a+" li:last-child .form_select_opt").val("select"),e(".redux-multitext_repeater-remove").removeAttr("style")}})}})}}(jQuery);
includes/options/redux-core/inc/fields/repeater/field_repeater.js CHANGED
@@ -33,7 +33,7 @@
33
  } else {
34
  return;
35
  }
36
- el.find( '.redux-repeater-remove' ).live(
37
  'click', function() {
38
  redux_change( $( this ) );
39
  $( this ).prev( 'input[type="text"]' ).val( '' );
33
  } else {
34
  return;
35
  }
36
+ el.find( '.redux-repeater-remove' ).on(
37
  'click', function() {
38
  redux_change( $( this ) );
39
  $( this ).prev( 'input[type="text"]' ).val( '' );
includes/options/redux-core/inc/fields/repeater/field_repeater.min.js CHANGED
@@ -1 +1 @@
1
- !function(e){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.repeater=redux.field_objects.repeater||{},e(document).ready(function(){}),redux.field_objects.repeater.init=function(t){t||(t=e(document).find(".redux-container-repeater:visible")),e(t).each(function(){var t=e(this),r=t;t.hasClass("redux-field-container")||(r=t.parents(".redux-field-container:first")),r.is(":hidden")||r.hasClass("redux-field-init")&&(r.removeClass("redux-field-init"),t.find(".redux-repeater-remove").live("click",function(){redux_change(e(this)),e(this).prev('input[type="text"]').val(""),e(this).parent().parent().slideUp("medium",function(){e(this).remove(),1==e(".redux-repeater-remove").length&&e(".redux-repeater-remove").css({display:"none"})})}),t.find(".redux-repeater-add").click(function(){for(var r=parseInt(e(this).attr("data-add_number")),i=e(this).attr("data-id"),d=(e(this).attr("data-name"),0);d<r;d++){var n=e("#"+i+" li:last-child").clone();t.find("#"+i).append(n),t.find("#"+i+" li:last-child").removeAttr("style"),t.find("#"+i+' li:last-child input[type="text"]').val("Enter URL Here"),e(".redux-repeater-remove").removeAttr("style")}}))})}}(jQuery);
1
+ !function(e){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.repeater=redux.field_objects.repeater||{},e(document).ready(function(){}),redux.field_objects.repeater.init=function(t){t||(t=e(document).find(".redux-container-repeater:visible")),e(t).each(function(){var t=e(this),r=t;t.hasClass("redux-field-container")||(r=t.parents(".redux-field-container:first")),r.is(":hidden")||r.hasClass("redux-field-init")&&(r.removeClass("redux-field-init"),t.find(".redux-repeater-remove").on("click",function(){redux_change(e(this)),e(this).prev('input[type="text"]').val(""),e(this).parent().parent().slideUp("medium",function(){e(this).remove(),1==e(".redux-repeater-remove").length&&e(".redux-repeater-remove").css({display:"none"})})}),t.find(".redux-repeater-add").click(function(){for(var r=parseInt(e(this).attr("data-add_number")),i=e(this).attr("data-id"),d=(e(this).attr("data-name"),0);d<r;d++){var n=e("#"+i+" li:last-child").clone();t.find("#"+i).append(n),t.find("#"+i+" li:last-child").removeAttr("style"),t.find("#"+i+' li:last-child input[type="text"]').val("Enter URL Here"),e(".redux-repeater-remove").removeAttr("style")}}))})}}(jQuery);
includes/options/redux-core/inc/fields/slides/field_slides.js CHANGED
@@ -42,7 +42,7 @@
42
  return;
43
  }
44
 
45
- el.find( '.redux-slides-remove' ).live(
46
  'click', function() {
47
  redux_change( $( this ) );
48
 
42
  return;
43
  }
44
 
45
+ el.find( '.redux-slides-remove' ).on(
46
  'click', function() {
47
  redux_change( $( this ) );
48
 
includes/options/redux-core/inc/fields/slides/field_slides.min.js CHANGED
@@ -1 +1 @@
1
- !function(a){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.slides=redux.field_objects.slides||{},a(document).ready(function(){}),redux.field_objects.slides.init=function(b){b||(b=a(document).find(".redux-group-tab:visible").find(".redux-container-slides:visible")),a(b).each(function(){var b=a(this);redux.field_objects.media.init(b);var c=b;b.hasClass("redux-field-container")||(c=b.parents(".redux-field-container:first")),c.is(":hidden")||(c.hasClass("redux-container-slides")&&c.addClass("redux-field-init"),c.hasClass("redux-field-init")&&(c.removeClass("redux-field-init"),b.find(".redux-slides-remove").live("click",function(){redux_change(a(this)),a(this).parent().siblings().find('input[type="text"]').val(""),a(this).parent().siblings().find("textarea").val(""),a(this).parent().siblings().find('input[type="hidden"]').val("");var b=a(this).parents(".redux-container-slides:first").find(".redux-slides-accordion-group").length;if(b>1)a(this).parents(".redux-slides-accordion-group:first").slideUp("medium",function(){a(this).remove()});else{var c=a(this).parent(".redux-slides-accordion").data("new-content-title");a(this).parents(".redux-slides-accordion-group:first").find(".remove-image").click(),a(this).parents(".redux-container-slides:first").find(".redux-slides-accordion-group:last").find(".redux-slides-header").text(c)}}),b.find(".redux-slides-add").off("click").click(function(){var b=a(this).prev().find(".redux-slides-accordion-group:last").clone(!0),c=a(b).find(".slide-title").attr("name").match(/[0-9]+(?!.*[0-9])/),d=1*c+1;a(b).find('input[type="text"], input[type="hidden"], textarea').each(function(){a(this).attr("name",jQuery(this).attr("name").replace(/[0-9]+(?!.*[0-9])/,d)).attr("id",a(this).attr("id").replace(/[0-9]+(?!.*[0-9])/,d)),a(this).val(""),a(this).hasClass("slide-sort")&&a(this).val(d)});var e=a(this).prev().data("new-content-title");a(b).find(".screenshot").removeAttr("style"),a(b).find(".screenshot").addClass("hide"),a(b).find(".screenshot a").attr("href",""),a(b).find(".remove-image").addClass("hide"),a(b).find(".redux-slides-image").attr("src","").removeAttr("id"),a(b).find("h3").text("").append('<span class="redux-slides-header">'+e+'</span><span class="ui-accordion-header-icon ui-icon ui-icon-plus"></span>'),a(this).prev().append(b)}),b.find(".slide-title").keyup(function(b){var c=b.target.value;a(this).parents().eq(3).find(".redux-slides-header").text(c)}),b.find(".redux-slides-accordion").accordion({header:"> div > fieldset > h3",collapsible:!0,active:!1,heightStyle:"content",icons:{header:"ui-icon-plus",activeHeader:"ui-icon-minus"}}).sortable({axis:"y",handle:"h3",connectWith:".redux-slides-accordion",start:function(a,b){b.placeholder.height(b.item.height()),b.placeholder.width(b.item.width())},placeholder:"ui-state-highlight",stop:function(b,c){c.item.children("h3").triggerHandler("focusout");var d=a("input.slide-sort");d.each(function(b){a(this).val(b)})}})))})}}(jQuery);
1
+ !function(a){"use strict";redux.field_objects=redux.field_objects||{},redux.field_objects.slides=redux.field_objects.slides||{},a(document).ready(function(){}),redux.field_objects.slides.init=function(b){b||(b=a(document).find(".redux-group-tab:visible").find(".redux-container-slides:visible")),a(b).each(function(){var b=a(this);redux.field_objects.media.init(b);var c=b;b.hasClass("redux-field-container")||(c=b.parents(".redux-field-container:first")),c.is(":hidden")||(c.hasClass("redux-container-slides")&&c.addClass("redux-field-init"),c.hasClass("redux-field-init")&&(c.removeClass("redux-field-init"),b.find(".redux-slides-remove").on("click",function(){redux_change(a(this)),a(this).parent().siblings().find('input[type="text"]').val(""),a(this).parent().siblings().find("textarea").val(""),a(this).parent().siblings().find('input[type="hidden"]').val("");var b=a(this).parents(".redux-container-slides:first").find(".redux-slides-accordion-group").length;if(b>1)a(this).parents(".redux-slides-accordion-group:first").slideUp("medium",function(){a(this).remove()});else{var c=a(this).parent(".redux-slides-accordion").data("new-content-title");a(this).parents(".redux-slides-accordion-group:first").find(".remove-image").click(),a(this).parents(".redux-container-slides:first").find(".redux-slides-accordion-group:last").find(".redux-slides-header").text(c)}}),b.find(".redux-slides-add").off("click").click(function(){var b=a(this).prev().find(".redux-slides-accordion-group:last").clone(!0),c=a(b).find(".slide-title").attr("name").match(/[0-9]+(?!.*[0-9])/),d=1*c+1;a(b).find('input[type="text"], input[type="hidden"], textarea').each(function(){a(this).attr("name",jQuery(this).attr("name").replace(/[0-9]+(?!.*[0-9])/,d)).attr("id",a(this).attr("id").replace(/[0-9]+(?!.*[0-9])/,d)),a(this).val(""),a(this).hasClass("slide-sort")&&a(this).val(d)});var e=a(this).prev().data("new-content-title");a(b).find(".screenshot").removeAttr("style"),a(b).find(".screenshot").addClass("hide"),a(b).find(".screenshot a").attr("href",""),a(b).find(".remove-image").addClass("hide"),a(b).find(".redux-slides-image").attr("src","").removeAttr("id"),a(b).find("h3").text("").append('<span class="redux-slides-header">'+e+'</span><span class="ui-accordion-header-icon ui-icon ui-icon-plus"></span>'),a(this).prev().append(b)}),b.find(".slide-title").keyup(function(b){var c=b.target.value;a(this).parents().eq(3).find(".redux-slides-header").text(c)}),b.find(".redux-slides-accordion").accordion({header:"> div > fieldset > h3",collapsible:!0,active:!1,heightStyle:"content",icons:{header:"ui-icon-plus",activeHeader:"ui-icon-minus"}}).sortable({axis:"y",handle:"h3",connectWith:".redux-slides-accordion",start:function(a,b){b.placeholder.height(b.item.height()),b.placeholder.width(b.item.width())},placeholder:"ui-state-highlight",stop:function(b,c){c.item.children("h3").triggerHandler("focusout");var d=a("input.slide-sort");d.each(function(b){a(this).val(b)})}})))})}}(jQuery);
includes/vendor/amp/includes/class-amp-post-template.php CHANGED
@@ -28,7 +28,7 @@ if ( version_compare( $wp_version, '5.3', '>=' ) ) {
28
  require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-gallery-block-sanitizer.php' );
29
  }
30
  require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-block-sanitizer.php' );
31
-
32
  require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-twitter-embed.php' );
33
  require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-youtube-embed.php' );
34
  require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-dailymotion-embed.php' );
@@ -286,10 +286,12 @@ class AMP_Post_Template {
286
  $new_post_content = '';
287
  // #2001 Filter to remove the unused JS from the paginated post
288
  $new_post_content = apply_filters( 'ampforwp_post_content_filter', $new_post_content );
 
289
 
290
  $amp_content = new AMP_Content( $new_post_content,
291
  apply_filters( 'amp_content_embed_handlers', array(
292
  'AMP_Core_Block_Handler' => array(),
 
293
  'AMP_Twitter_Embed_Handler' => array(),
294
  'AMP_YouTube_Embed_Handler' => array(),
295
  'AMP_DailyMotion_Embed_Handler' => array(),
@@ -337,7 +339,16 @@ class AMP_Post_Template {
337
  $this->add_data_by_key( 'post_amp_styles', array() );
338
  }
339
  }
340
-
 
 
 
 
 
 
 
 
 
341
 
342
  private function build_post_featured_image() {
343
  $post_id = $this->ID;
28
  require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-gallery-block-sanitizer.php' );
29
  }
30
  require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-block-sanitizer.php' );
31
+ require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-reddit-embed.php' );
32
  require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-twitter-embed.php' );
33
  require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-youtube-embed.php' );
34
  require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-dailymotion-embed.php' );
286
  $new_post_content = '';
287
  // #2001 Filter to remove the unused JS from the paginated post
288
  $new_post_content = apply_filters( 'ampforwp_post_content_filter', $new_post_content );
289
+ $new_post_content .= $this->ampforwp_tiktok_video_support($new_post_content);
290
 
291
  $amp_content = new AMP_Content( $new_post_content,
292
  apply_filters( 'amp_content_embed_handlers', array(
293
  'AMP_Core_Block_Handler' => array(),
294
+ 'AMP_Reddit_Embed_Handler' => array(),
295
  'AMP_Twitter_Embed_Handler' => array(),
296
  'AMP_YouTube_Embed_Handler' => array(),
297
  'AMP_DailyMotion_Embed_Handler' => array(),
339
  $this->add_data_by_key( 'post_amp_styles', array() );
340
  }
341
  }
342
+ public function ampforwp_tiktok_video_support($content){
343
+ if(preg_match('/<blockquote(.*?)(https?:\/\/(?:www\.)?(?:tiktok\.com\/@(.*?)\/video\/\d+))(.*?)data-video-id="(.*?)"(.*?)<\/blockquote>/i', $content,$matches)){
344
+ if(isset($matches[5])){
345
+ $src = 'https://www.tiktok.com/embed/v2/'.$matches[5].'?lang=en-US';
346
+ $iframe = '<iframe src="'.esc_url_raw($src).'" width="375" height="820" allow="fullscreen"></iframe>';
347
+ $content = preg_replace('/<blockquote(.*?)(https?:\/\/(?:www\.)?(?:tiktok\.com\/@(.*?)\/video\/\d+))(.*?)data-video-id="(.*?)"(.*?)<\/blockquote>/i', $iframe, $content);
348
+ }
349
+ return $content;
350
+ }
351
+ }
352
 
353
  private function build_post_featured_image() {
354
  $post_id = $this->ID;
includes/vendor/amp/includes/embeds/class-amp-reddit-embed.php ADDED
@@ -0,0 +1,76 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ namespace AMPforWP\AMPVendor;
3
+ if ( ! defined( 'ABSPATH' ) ) {
4
+ exit;
5
+ }
6
+ require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-base-embed-handler.php' );
7
+
8
+ // Much of this class is borrowed from Jetpack embeds
9
+ class AMP_Reddit_Embed_Handler extends AMP_Base_Embed_Handler {
10
+ const URL_PATTERN = '#http(s|):\/\/www.reddit\.com(\/\#\!\/|\/)([a-zA-Z0-9_]{1,20})\/(.*?)\/comments\/([a-zA-Z0-9_]{1,20})\/([a-zA-Z0-9_]{1,20})#i';
11
+
12
+ private static $script_slug = 'amp-reddit';
13
+ private static $script_src = 'https://cdn.ampproject.org/v0/amp-reddit-0.1.js';
14
+
15
+ public function register_embed() {
16
+ add_shortcode( 'reddit', array( $this, 'shortcode' ) );
17
+ wp_embed_register_handler( 'amp-reddit', self::URL_PATTERN, array( $this, 'oembed' ), -1 );
18
+ }
19
+
20
+ public function unregister_embed() {
21
+ remove_shortcode( 'reddit' );
22
+ wp_embed_unregister_handler( 'amp-reddit', -1 );
23
+ }
24
+
25
+ public function get_scripts() {
26
+ if ( ! $this->did_convert_elements ) {
27
+ return array();
28
+ }
29
+
30
+ return array( self::$script_slug => self::$script_src );
31
+ }
32
+
33
+ function shortcode( $attr ) {
34
+ $attr = wp_parse_args( $attr, array(
35
+ 'reddit' => false,
36
+ ) );
37
+
38
+ if ( empty( $attr['reddit'] ) && ! empty( $attr[0] ) ) {
39
+ $attr['reddit'] = $attr[0];
40
+ }
41
+
42
+ $url = false;
43
+ preg_match( self::URL_PATTERN, $attr['reddit'], $matches );
44
+ if ( isset( $matches[0] )) {
45
+ $url = $matches[0];
46
+ }
47
+
48
+ if ( empty( $url ) ) {
49
+ return '';
50
+ }
51
+ $this->did_convert_elements = true;
52
+ $attrs = array(
53
+ 'data-src' => $url,
54
+ 'layout' => 'responsive',
55
+ 'width' => $this->args['width'],
56
+ 'height' => $this->args['height'],
57
+ 'data-embedtype'=>"post"
58
+ );
59
+ $attrs = ampforwp_amp_consent_check( $attrs );
60
+ return AMP_HTML_Utils::build_tag('amp-reddit',$attrs);
61
+ }
62
+
63
+ function oembed( $matches, $attr, $url, $rawattr ) {
64
+ $url = false;
65
+
66
+ if ( isset( $matches[0] )) {
67
+ $url = $matches[0];
68
+ }
69
+
70
+ if ( ! $url ) {
71
+ return '';
72
+ }
73
+
74
+ return $this->shortcode( array( 'reddit' => $url ) );
75
+ }
76
+ }
includes/vendor/tinymce-widget/js/tinymce-widget-pre33.js CHANGED
@@ -185,7 +185,7 @@
185
  $( document ).ready(function() {
186
 
187
  // Event handler for widget open button
188
- $( 'div.widget[id*=black-studio-tinymce] .widget-title, div.widget[id*=black-studio-tinymce] a.widget-action' ).live( 'click', function() {
189
  bstw( $( this ) ).check_duplicates().fix_css().set_media_target().activate_after_open();
190
  // Event handler for widget save button (for new instances)
191
  // Note: this event handler is intentionally attached to the save button instead of document
@@ -202,7 +202,7 @@
202
  });
203
 
204
  // Event handler for widget save button (for existing instances)
205
- $( 'div.widget[id*=black-studio-tinymce] input[name=savewidget]' ).live( 'click', function() {
206
  if ( bstw( $( this ) ).is_tinymce_active() ) {
207
  bstw( $( this ) ).deactivate();
208
  }
@@ -213,17 +213,17 @@
213
  });
214
 
215
  // Event handler for visual switch button
216
- $( 'a[id^=widget-black-studio-tinymce][id$=tmce]' ).live( 'click', function() {
217
  bstw( $( this ) ).set_mode( 'visual' );
218
  });
219
 
220
  // Event handler for html switch button
221
- $( 'a[id^=widget-black-studio-tinymce][id$=html]' ).live( 'click', function() {
222
  bstw( $( this ) ).set_mode( 'html' );
223
  });
224
 
225
  // Set wpActiveEditor variables used when adding media from media library dialog
226
- $( '.wp-media-buttons a' ).live( 'click', function() {
227
  edCanvas = bstw( $( this ) ).get_textarea().get();
228
  wpActiveEditor = bstw( $( this ) ).get_id();
229
  });
@@ -234,7 +234,7 @@
234
  }
235
 
236
  // Plugin links toggle behavior
237
- $( '.bstw-links-icon' ).live( 'click', function( event ) {
238
  event.preventDefault();
239
  $( this ).closest( '.bstw-links' ).children( '.bstw-links-list' ).toggle();
240
  });
185
  $( document ).ready(function() {
186
 
187
  // Event handler for widget open button
188
+ $( 'div.widget[id*=black-studio-tinymce] .widget-title, div.widget[id*=black-studio-tinymce] a.widget-action' ).on( 'click', function() {
189
  bstw( $( this ) ).check_duplicates().fix_css().set_media_target().activate_after_open();
190
  // Event handler for widget save button (for new instances)
191
  // Note: this event handler is intentionally attached to the save button instead of document
202
  });
203
 
204
  // Event handler for widget save button (for existing instances)
205
+ $( 'div.widget[id*=black-studio-tinymce] input[name=savewidget]' ).on( 'click', function() {
206
  if ( bstw( $( this ) ).is_tinymce_active() ) {
207
  bstw( $( this ) ).deactivate();
208
  }
213
  });
214
 
215
  // Event handler for visual switch button
216
+ $( 'a[id^=widget-black-studio-tinymce][id$=tmce]' ).on( 'click', function() {
217
  bstw( $( this ) ).set_mode( 'visual' );
218
  });
219
 
220
  // Event handler for html switch button
221
+ $( 'a[id^=widget-black-studio-tinymce][id$=html]' ).on( 'click', function() {
222
  bstw( $( this ) ).set_mode( 'html' );
223
  });
224
 
225
  // Set wpActiveEditor variables used when adding media from media library dialog
226
+ $( '.wp-media-buttons a' ).on( 'click', function() {
227
  edCanvas = bstw( $( this ) ).get_textarea().get();
228
  wpActiveEditor = bstw( $( this ) ).get_id();
229
  });
234
  }
235
 
236
  // Plugin links toggle behavior
237
+ $( '.bstw-links-icon' ).on( 'click', function( event ) {
238
  event.preventDefault();
239
  $( this ).closest( '.bstw-links' ).children( '.bstw-links-list' ).toggle();
240
  });
includes/vendor/tinymce-widget/js/tinymce-widget-pre33.min.js CHANGED
@@ -1,2 +1,2 @@
1
  /* Black Studio TinyMCE Widget */
2
- !function(a){function b(c){var d=null;return"string"==typeof c?d=c:"object"==typeof c&&c instanceof jQuery&&(d=a("textarea[id^=widget-black-studio-tinymce]",c.closest(bstw_data.container_selectors)).attr("id")),{activate:function(){if(a("#"+d).addClass("mceEditor"),"object"==typeof tinymce&&"function"==typeof tinymce.execCommand){this.deactivate();try{tinymce.execCommand("mceAddControl",!1,d)}catch(b){window.alert(b)}}return this},deactivate:function(){if("object"==typeof tinymce&&"function"==typeof tinymce.execCommand&&this.is_tinymce_active()){var b=tinymce.get(d).getContent();tinymce.get(d).remove(),a("#"+d).val(b)}return this},activate_after_open:function(){return"visual"===this.get_mode()&&(0===a("div.widget:has(#"+d+") :animated").size()&&!this.is_tinymce_active()&&this.is_textearea_visible()?this.set_mode("visual"):this.is_tinymce_active()?this.set_mode("visual"):setTimeout(function(){b(d).activate_after_open()},100)),this},activate_after_ajax:function(){return"visual"===this.get_mode()&&(0===a.active&&!this.is_tinymce_active()&&this.is_textearea_visible()?this.set_mode("visual"):this.is_widget_inside_visible()&&!this.is_tinymce_active()&&setTimeout(function(){b(d).activate_after_ajax()},100)),this},get_widget:function(){return a("#"+d).closest("div.widget")},get_widget_inside:function(){return a("#"+d).closest("div.widget-inside")},get_editor_wrap:function(){return a("#"+d).closest("div.wp-editor-wrap")},get_textarea:function(){return a("#"+d)},get_id:function(){return d},get_tinymce:function(){return tinymce.get(d)},get_mode:function(){return a("input[id^=widget-black-studio-tinymce][id$=type]",this.get_widget_inside()).val()},set_mode:function(b){return"visual"===b&&(this.get_editor_wrap().removeClass("html-active").addClass("tmce-active"),this.activate()),"html"===b&&(this.get_editor_wrap().removeClass("tmce-active").addClass("html-active"),this.deactivate()),a("input[id^=widget-black-studio-tinymce][id$=type]",this.get_widget_inside()).val(b),this},is_tinymce_active:function(){return"object"==typeof tinymce&&"object"==typeof tinymce.get(d)&&null!==tinymce.get(d)},is_textearea_visible:function(){return a("#"+d).is(":visible")},is_widget_inside_visible:function(){return a(" div.widget-inside:has(#"+d+")").is(":visible")},check_duplicates:function(){return a('[name="'+this.get_textarea().attr("name")+'"]').size()>1&&0===a("div.error",this.get_widget_inside()).length&&this.get_widget_inside().prepend('<div class="error"><strong>'+bstw_data.error_duplicate_id+"</strong></div>"),this},fix_css:function(){return this.get_widget().css("position","relative").css("z-index","100000"),a("#wpbody-content").css("overflow","visible"),this},set_media_target:function(){return a(".insert-media",this.get_widget()).data("editor",d),this}}}a(document).ready(function(){a("div.widget[id*=black-studio-tinymce] .widget-title, div.widget[id*=black-studio-tinymce] a.widget-action").live("click",function(){b(a(this)).check_duplicates().fix_css().set_media_target().activate_after_open(),a("input[name=savewidget]",b(a(this)).get_widget()).click(function(){b(a(this)).is_tinymce_active()&&b(a(this)).deactivate(),a(this).unbind("ajaxSuccess").ajaxSuccess(function(){b(a(this)).activate_after_ajax()})})}),a("div.widget[id*=black-studio-tinymce] input[name=savewidget]").live("click",function(){b(a(this)).is_tinymce_active()&&b(a(this)).deactivate(),a(this).unbind("ajaxSuccess").ajaxSuccess(function(){b(a(this)).activate_after_ajax()})}),a("a[id^=widget-black-studio-tinymce][id$=tmce]").live("click",function(){b(a(this)).set_mode("visual")}),a("a[id^=widget-black-studio-tinymce][id$=html]").live("click",function(){b(a(this)).set_mode("html")}),a(".wp-media-buttons a").live("click",function(){edCanvas=b(a(this)).get_textarea().get(),wpActiveEditor=b(a(this)).get_id()}),a("body.widgets_access").size()>0&&b(a("textarea[id^=widget-black-studio-tinymce]").attr("id")).activate_after_open(),a(".bstw-links-icon").live("click",function(b){b.preventDefault(),a(this).closest(".bstw-links").children(".bstw-links-list").toggle()})})}(jQuery);
1
  /* Black Studio TinyMCE Widget */
2
+ !function(a){function b(c){var d=null;return"string"==typeof c?d=c:"object"==typeof c&&c instanceof jQuery&&(d=a("textarea[id^=widget-black-studio-tinymce]",c.closest(bstw_data.container_selectors)).attr("id")),{activate:function(){if(a("#"+d).addClass("mceEditor"),"object"==typeof tinymce&&"function"==typeof tinymce.execCommand){this.deactivate();try{tinymce.execCommand("mceAddControl",!1,d)}catch(b){window.alert(b)}}return this},deactivate:function(){if("object"==typeof tinymce&&"function"==typeof tinymce.execCommand&&this.is_tinymce_active()){var b=tinymce.get(d).getContent();tinymce.get(d).remove(),a("#"+d).val(b)}return this},activate_after_open:function(){return"visual"===this.get_mode()&&(0===a("div.widget:has(#"+d+") :animated").size()&&!this.is_tinymce_active()&&this.is_textearea_visible()?this.set_mode("visual"):this.is_tinymce_active()?this.set_mode("visual"):setTimeout(function(){b(d).activate_after_open()},100)),this},activate_after_ajax:function(){return"visual"===this.get_mode()&&(0===a.active&&!this.is_tinymce_active()&&this.is_textearea_visible()?this.set_mode("visual"):this.is_widget_inside_visible()&&!this.is_tinymce_active()&&setTimeout(function(){b(d).activate_after_ajax()},100)),this},get_widget:function(){return a("#"+d).closest("div.widget")},get_widget_inside:function(){return a("#"+d).closest("div.widget-inside")},get_editor_wrap:function(){return a("#"+d).closest("div.wp-editor-wrap")},get_textarea:function(){return a("#"+d)},get_id:function(){return d},get_tinymce:function(){return tinymce.get(d)},get_mode:function(){return a("input[id^=widget-black-studio-tinymce][id$=type]",this.get_widget_inside()).val()},set_mode:function(b){return"visual"===b&&(this.get_editor_wrap().removeClass("html-active").addClass("tmce-active"),this.activate()),"html"===b&&(this.get_editor_wrap().removeClass("tmce-active").addClass("html-active"),this.deactivate()),a("input[id^=widget-black-studio-tinymce][id$=type]",this.get_widget_inside()).val(b),this},is_tinymce_active:function(){return"object"==typeof tinymce&&"object"==typeof tinymce.get(d)&&null!==tinymce.get(d)},is_textearea_visible:function(){return a("#"+d).is(":visible")},is_widget_inside_visible:function(){return a(" div.widget-inside:has(#"+d+")").is(":visible")},check_duplicates:function(){return a('[name="'+this.get_textarea().attr("name")+'"]').size()>1&&0===a("div.error",this.get_widget_inside()).length&&this.get_widget_inside().prepend('<div class="error"><strong>'+bstw_data.error_duplicate_id+"</strong></div>"),this},fix_css:function(){return this.get_widget().css("position","relative").css("z-index","100000"),a("#wpbody-content").css("overflow","visible"),this},set_media_target:function(){return a(".insert-media",this.get_widget()).data("editor",d),this}}}a(document).ready(function(){a("div.widget[id*=black-studio-tinymce] .widget-title, div.widget[id*=black-studio-tinymce] a.widget-action").on("click",function(){b(a(this)).check_duplicates().fix_css().set_media_target().activate_after_open(),a("input[name=savewidget]",b(a(this)).get_widget()).click(function(){b(a(this)).is_tinymce_active()&&b(a(this)).deactivate(),a(this).unbind("ajaxSuccess").ajaxSuccess(function(){b(a(this)).activate_after_ajax()})})}),a("div.widget[id*=black-studio-tinymce] input[name=savewidget]").on("click",function(){b(a(this)).is_tinymce_active()&&b(a(this)).deactivate(),a(this).unbind("ajaxSuccess").ajaxSuccess(function(){b(a(this)).activate_after_ajax()})}),a("a[id^=widget-black-studio-tinymce][id$=tmce]").on("click",function(){b(a(this)).set_mode("visual")}),a("a[id^=widget-black-studio-tinymce][id$=html]").on("click",function(){b(a(this)).set_mode("html")}),a(".wp-media-buttons a").on("click",function(){edCanvas=b(a(this)).get_textarea().get(),wpActiveEditor=b(a(this)).get_id()}),a("body.widgets_access").size()>0&&b(a("textarea[id^=widget-black-studio-tinymce]").attr("id")).activate_after_open(),a(".bstw-links-icon").on("click",function(b){b.preventDefault(),a(this).closest(".bstw-links").children(".bstw-links-list").toggle()})})}(jQuery);
pagebuilder/modules/pricing-mod-module.php CHANGED
@@ -176,6 +176,20 @@ return array(
176
  ),
177
  'content_type'=>'html',
178
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
179
  array(
180
  'type' =>'text-editor',
181
  'name' =>"text_desc",
@@ -201,7 +215,7 @@ return array(
201
  {{if_recommended_text}}<span class="pri-recom">{{recommended_text}}</span>{{ifend_recommended_text}}
202
  <span class="pri-lbl">{{price_label}}</span>
203
  <span class="pri-desc">{{price_desc}}</span>
204
- <a href="{{btn_link}}" {{if_condition_page_link_open_price==new_page}}target="_blank"{{ifend_condition_page_link_open_price_new_page}} class="btn-txt">{{btn_title}}</a>
205
  <div class="pri-cnt">
206
  {{text_desc}}
207
  </div>
176
  ),
177
  'content_type'=>'html',
178
  ),
179
+ array(
180
+ 'type' =>'checkbox_bool',
181
+ 'name' =>"check_for_nofollow_price",
182
+ 'label' => 'Nofollow Link',
183
+ 'tab' =>'customizer',
184
+ 'default' =>0,
185
+ 'options' =>array(
186
+ array(
187
+ 'label'=>'Yes',
188
+ 'value'=>1,
189
+ )
190
+ ),
191
+ 'content_type'=>'html',
192
+ ),
193
  array(
194
  'type' =>'text-editor',
195
  'name' =>"text_desc",
215
  {{if_recommended_text}}<span class="pri-recom">{{recommended_text}}</span>{{ifend_recommended_text}}
216
  <span class="pri-lbl">{{price_label}}</span>
217
  <span class="pri-desc">{{price_desc}}</span>
218
+ <a href="{{btn_link}}" {{if_condition_page_link_open_price==new_page}}target="_blank"{{ifend_condition_page_link_open_price_new_page}} {{if_condition_check_for_nofollow_price==1}}rel="nofollow"{{ifend_condition_check_for_nofollow_price_1}} class="btn-txt">{{btn_title}}</a>
219
  <div class="pri-cnt">
220
  {{text_desc}}
221
  </div>
pagebuilder/modules/video-module.php CHANGED
@@ -22,6 +22,7 @@ $output = '
22
  {{if_condition_video_option==youtube}}
23
  <amp-youtube {{if_id}}id="{{id}}"{{ifend_id}}
24
  data-videoid="{{youtube_video_id}}"
 
25
  layout="responsive"
26
  width="{{width}}" height="{{height}}"></amp-youtube>
27
  {{ifend_condition_video_option_youtube}}
@@ -115,6 +116,21 @@ return array(
115
  'video_option'=>'youtube',
116
  ),
117
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
118
  array(
119
  'type' =>'checkbox_bool',
120
  'name' =>"autoplay",
22
  {{if_condition_video_option==youtube}}
23
  <amp-youtube {{if_id}}id="{{id}}"{{ifend_id}}
24
  data-videoid="{{youtube_video_id}}"
25
+ {{if_condition_hide_rel_video==1}} data-param-rel="0" {{ifend_condition_hide_rel_video_1}}
26
  layout="responsive"
27
  width="{{width}}" height="{{height}}"></amp-youtube>
28
  {{ifend_condition_video_option_youtube}}
116
  'video_option'=>'youtube',
117
  ),
118
  ),
119
+ array(
120
+ 'type' =>'checkbox_bool',
121
+ 'name' =>"hide_rel_video",
122
+ 'label' =>'Hide other channels related video',
123
+ 'tab' =>'customizer',
124
+ 'default' =>1,
125
+ 'options' =>array(
126
+ array(
127
+ 'label'=>'Setting this option will show given youtube video id channels related videos only.',
128
+ 'value'=>1,
129
+ ),
130
+ ),
131
+ 'content_type'=>'html',
132
+ 'required' => array('video_option'=>'youtube'),
133
+ ),
134
  array(
135
  'type' =>'checkbox_bool',
136
  'name' =>"autoplay",
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.5
7
- Stable tag: 1.0.62.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -190,6 +190,27 @@ You can contact us from [here](https://ampforwp.com/contact/)
190
 
191
  == Changelog ==
192
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
193
  = 1.0.62.2 (21st August 2020) =
194
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
195
  * Fixed: Validation error - accordion section must have 2 child tags #4208
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.5
7
+ Stable tag: 1.0.63
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.63 (26th September 2020) =
194
+ * Improvement: Added Reddit embeds support #4406
195
+ * Improvement: Added multi select for post type in loop field #4365
196
+ * Improvement: Added custom classes in Body tag in AMP in all Designs #4594
197
+ * Improvement: Added filter for GDPR on-off #4471
198
+ * Improvement: Added admin notice when wrong seo plugin is selected #4678
199
+ * Improvement: Added TikTok embed support #4504
200
+ * Improvement: Added related post on/off in YouTube #4503
201
+ * Improvement: Added Nofollow Link button on pricing tabs in AMP Page Builder #4505
202
+ * Improvement: Improved Lighthouse Audits #4654
203
+ * Improvement: Added filter for AMP front page function #4634
204
+ * Fixed: Facebook Instant Articles (FBIA) Crawler Ingestion not working #4463
205
+ * Fixed: Incontent related post not aligned if the post does not have featured image #4691
206
+ * Fixed: Incontent path passed to load_plugin_textdomain function #4694
207
+ * Fixed: Incorrect Styling for header area #4703
208
+ * Fixed: Breadcrumb links are not generating the "amp/" #4708
209
+ * Fixed: Google Analytics is not firing when GTM is enabled #4707
210
+ * Fixed: Featured Image doesn’t appear on single post #4711
211
+ * Fixed: Code improvements for options panel #4622 #4532 #4407 #4090
212
+ * Fixed: Advanced section showing blank randomly #4741
213
+
214
  = 1.0.62.2 (21st August 2020) =
215
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
216
  * Fixed: Validation error - accordion section must have 2 child tags #4208
templates/custom-amp-content.php CHANGED
@@ -43,6 +43,7 @@ function ampforwp_custom_post_content_sanitizer( $data, $post ) {
43
  if ( 'yes' === $amp_custom_post_content_check ) {
44
  $amp_custom_content = new AMP_Content( $amp_custom_post_content_input,
45
  apply_filters( 'amp_content_embed_handlers', array(
 
46
  'AMP_Twitter_Embed_Handler' => array(),
47
  'AMP_YouTube_Embed_Handler' => array(),
48
  'AMP_DailyMotion_Embed_Handler' => array(),
43
  if ( 'yes' === $amp_custom_post_content_check ) {
44
  $amp_custom_content = new AMP_Content( $amp_custom_post_content_input,
45
  apply_filters( 'amp_content_embed_handlers', array(
46
+ 'AMP_Reddit_Embed_Handler' => array(),
47
  'AMP_Twitter_Embed_Handler' => array(),
48
  'AMP_YouTube_Embed_Handler' => array(),
49
  'AMP_DailyMotion_Embed_Handler' => array(),
templates/design-manager.php CHANGED
@@ -14,8 +14,6 @@ if ( is_customize_preview() ) {
14
  add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_comments' );
15
  add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_related_posts' );
16
  add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_bread_crumbs' );
17
-
18
- // add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_simple_comment_button' );
19
  }
20
 
21
  $data = get_option( 'ampforwp_design',array());
@@ -111,15 +109,24 @@ function ampforwp_stylesheet_file_insertion() {
111
  require AMPFORWP_PLUGIN_DIR."/components/theme-loader.php";
112
  }
113
  }
114
-
 
 
 
 
 
 
 
 
 
 
 
115
  // Post Title
116
  function ampforwp_add_element_the_title( $meta_parts ) {
117
  $meta_parts[] = 'ampforwp-the-title';
118
  return $meta_parts;
119
  }
120
 
121
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_the_title', 10, 3 );
122
-
123
  function ampforwp_design_element_the_title( $file, $type, $post ) {
124
  if ( 'ampforwp-the-title' === $type ) {
125
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/title.php' ;
@@ -134,8 +141,6 @@ function ampforwp_add_element_meta_info( $meta_parts ) {
134
  return $meta_parts;
135
  }
136
 
137
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_meta_info', 10, 3 );
138
-
139
  function ampforwp_design_element_meta_info( $file, $type, $post ) {
140
  if ( 'ampforwp-meta-info' === $type ) {
141
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/meta-info.php' ;
@@ -149,8 +154,6 @@ function ampforwp_add_element_featured_image( $meta_parts ) {
149
  return $meta_parts;
150
  }
151
 
152
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_featured_image', 10, 3 );
153
-
154
  function ampforwp_design_element_featured_image( $file, $type, $post ) {
155
  if ( 'ampforwp-featured-image' === $type ) {
156
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/featured-image.php';
@@ -164,8 +167,6 @@ function ampforwp_add_element_bread_crumbs( $meta_parts ) {
164
  return $meta_parts;
165
  }
166
 
167
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_bread_crumbs', 10, 3 );
168
-
169
  function ampforwp_design_element_bread_crumbs( $file, $type, $post ) {
170
  if ( 'ampforwp-bread-crumbs' === $type ) {
171
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/bread-crumbs.php' ;
@@ -178,8 +179,6 @@ function ampforwp_add_element_the_content( $meta_parts ) {
178
  return $meta_parts;
179
  }
180
 
181
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_the_content', 10, 3 );
182
-
183
  function ampforwp_design_element_the_content( $file, $type, $post ) {
184
  if ( 'ampforwp-the-content' === $type ) {
185
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/content.php';
@@ -192,7 +191,6 @@ function ampforwp_add_element_meta_taxonomy( $meta_parts ) {
192
  $meta_parts[] = 'ampforwp-meta-taxonomy';
193
  return $meta_parts;
194
  }
195
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_meta_taxonomy', 10, 3 );
196
 
197
  function ampforwp_design_element_meta_taxonomy( $file, $type, $post ) {
198
  if ( 'ampforwp-meta-taxonomy' === $type ) {
@@ -206,7 +204,6 @@ function ampforwp_add_element_social_icons( $meta_parts ) {
206
  $meta_parts[] = 'ampforwp-social-icons';
207
  return $meta_parts;
208
  }
209
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_social_icons', 10, 3 );
210
 
211
  function ampforwp_design_element_social_icons( $file, $type, $post ) {
212
  if ( 'ampforwp-social-icons' === $type ) {
@@ -221,7 +218,6 @@ function ampforwp_add_element_comments( $meta_parts ) {
221
  $meta_parts[] = 'ampforwp-comments';
222
  return $meta_parts;
223
  }
224
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_comments', 10, 3 );
225
 
226
  function ampforwp_design_element_comments( $file, $type, $post ) {
227
  if ( 'ampforwp-comments' === $type ) {
@@ -230,26 +226,11 @@ function ampforwp_design_element_comments( $file, $type, $post ) {
230
  return $file;
231
  }
232
 
233
- // simple comment button
234
- function ampforwp_add_element_simple_comment_button( $meta_parts ) {
235
- $meta_parts[] = 'ampforwp-simple-comment-button';
236
- return $meta_parts;
237
- }
238
- // add_filter( 'amp_post_template_file', 'ampforwp_design_element_simple_comment_button', 10, 3 );
239
-
240
- function ampforwp_design_element_simple_comment_button( $file, $type, $post ) {
241
- if ( 'ampforwp-simple-comment-button' === $type ) {
242
- $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/simple-comment-button.php';
243
- }
244
- return $file;
245
- }
246
-
247
  // Related Posts
248
  function ampforwp_add_element_related_posts( $meta_parts ) {
249
  $meta_parts[] = 'ampforwp-related-posts';
250
  return $meta_parts;
251
  }
252
- add_filter( 'amp_post_template_file', 'ampforwp_design_element_related_posts', 10, 3 );
253
 
254
  function ampforwp_design_element_related_posts( $file, $type, $post ) {
255
  if ( 'ampforwp-related-posts' === $type ) {
@@ -259,7 +240,6 @@ function ampforwp_design_element_related_posts( $file, $type, $post ) {
259
  }
260
 
261
  // Empty meta parts when Pagebuilder is enabled
262
- add_filter('ampforwp_design_elements', 'ampforwp_empty_design_elements', 12);
263
  function ampforwp_empty_design_elements($meta_parts) {
264
  if( checkAMPforPageBuilderStatus(get_the_ID()) ){
265
  $meta_parts = array();
14
  add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_comments' );
15
  add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_related_posts' );
16
  add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_bread_crumbs' );
 
 
17
  }
18
 
19
  $data = get_option( 'ampforwp_design',array());
109
  require AMPFORWP_PLUGIN_DIR."/components/theme-loader.php";
110
  }
111
  }
112
+ if(4 != ampforwp_design_selector()){
113
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_the_title', 10, 3 );
114
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_meta_info', 10, 3 );
115
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_featured_image', 10, 3 );
116
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_bread_crumbs', 10, 3 );
117
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_the_content', 10, 3 );
118
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_social_icons', 10, 3 );
119
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_meta_taxonomy', 10, 3 );
120
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_comments', 10, 3 );
121
+ add_filter( 'amp_post_template_file', 'ampforwp_design_element_related_posts', 10, 3 );
122
+ add_filter('ampforwp_design_elements', 'ampforwp_empty_design_elements', 12);
123
+ }
124
  // Post Title
125
  function ampforwp_add_element_the_title( $meta_parts ) {
126
  $meta_parts[] = 'ampforwp-the-title';
127
  return $meta_parts;
128
  }
129
 
 
 
130
  function ampforwp_design_element_the_title( $file, $type, $post ) {
131
  if ( 'ampforwp-the-title' === $type ) {
132
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/title.php' ;
141
  return $meta_parts;
142
  }
143
 
 
 
144
  function ampforwp_design_element_meta_info( $file, $type, $post ) {
145
  if ( 'ampforwp-meta-info' === $type ) {
146
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/meta-info.php' ;
154
  return $meta_parts;
155
  }
156
 
 
 
157
  function ampforwp_design_element_featured_image( $file, $type, $post ) {
158
  if ( 'ampforwp-featured-image' === $type ) {
159
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/featured-image.php';
167
  return $meta_parts;
168
  }
169
 
 
 
170
  function ampforwp_design_element_bread_crumbs( $file, $type, $post ) {
171
  if ( 'ampforwp-bread-crumbs' === $type ) {
172
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/bread-crumbs.php' ;
179
  return $meta_parts;
180
  }
181
 
 
 
182
  function ampforwp_design_element_the_content( $file, $type, $post ) {
183
  if ( 'ampforwp-the-content' === $type ) {
184
  $file = AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() .'/elements/content.php';
191
  $meta_parts[] = 'ampforwp-meta-taxonomy';
192
  return $meta_parts;
193
  }
 
194
 
195
  function ampforwp_design_element_meta_taxonomy( $file, $type, $post ) {
196
  if ( 'ampforwp-meta-taxonomy' === $type ) {
204
  $meta_parts[] = 'ampforwp-social-icons';
205
  return $meta_parts;
206
  }
 
207
 
208
  function ampforwp_design_element_social_icons( $file, $type, $post ) {
209
  if ( 'ampforwp-social-icons' === $type ) {
218
  $meta_parts[] = 'ampforwp-comments';
219
  return $meta_parts;
220
  }
 
221
 
222
  function ampforwp_design_element_comments( $file, $type, $post ) {
223
  if ( 'ampforwp-comments' === $type ) {
226
  return $file;
227
  }
228
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
229
  // Related Posts
230
  function ampforwp_add_element_related_posts( $meta_parts ) {
231
  $meta_parts[] = 'ampforwp-related-posts';
232
  return $meta_parts;
233
  }
 
234
 
235
  function ampforwp_design_element_related_posts( $file, $type, $post ) {
236
  if ( 'ampforwp-related-posts' === $type ) {
240
  }
241
 
242
  // Empty meta parts when Pagebuilder is enabled
 
243
  function ampforwp_empty_design_elements($meta_parts) {
244
  if( checkAMPforPageBuilderStatus(get_the_ID()) ){
245
  $meta_parts = array();
templates/design-manager/design-1/elements/related-posts.php CHANGED
@@ -21,6 +21,7 @@ if( $current_post_type = get_post_type( $post )) {
21
  // The query arguments
22
  if($current_post_type != 'page'){
23
  $args = array(
 
24
  'posts_per_page'=> $int_number_of_related_posts,
25
  'post__not_in' => array($post->ID),
26
  'order' => 'DESC',
@@ -43,6 +44,7 @@ if($redux_builder_amp['ampforwp-single-select-type-of-related']==2) {
43
  $category_ids = array();
44
  foreach($categories as $individual_category) $category_ids[] = $individual_category->term_id;
45
  $args=array(
 
46
  'category__in' => $category_ids,
47
  'posts_per_page' => $int_number_of_related_posts,
48
  'post__not_in' => array($post->ID),
@@ -68,6 +70,7 @@ if($redux_builder_amp['ampforwp-single-select-type-of-related']==1) {
68
  $tag_ids = array();
69
  foreach($ampforwp_tags as $individual_tag) $tag_ids[] = $individual_tag->term_id;
70
  $args=array(
 
71
  'tag__in' => $tag_ids,
72
  'posts_per_page' => $int_number_of_related_posts,
73
  'post__not_in' => array($post->ID),
21
  // The query arguments
22
  if($current_post_type != 'page'){
23
  $args = array(
24
+ 'fields'=>'ids',
25
  'posts_per_page'=> $int_number_of_related_posts,
26
  'post__not_in' => array($post->ID),
27
  'order' => 'DESC',
44
  $category_ids = array();
45
  foreach($categories as $individual_category) $category_ids[] = $individual_category->term_id;
46
  $args=array(
47
+ 'fields'=>'ids',
48
  'category__in' => $category_ids,
49
  'posts_per_page' => $int_number_of_related_posts,
50
  'post__not_in' => array($post->ID),
70
  $tag_ids = array();
71
  foreach($ampforwp_tags as $individual_tag) $tag_ids[] = $individual_tag->term_id;
72
  $args=array(
73
+ 'fields'=>'ids',
74
  'tag__in' => $tag_ids,
75
  'posts_per_page' => $int_number_of_related_posts,
76
  'post__not_in' => array($post->ID),
templates/design-manager/design-1/elements/simple-comment-button.php DELETED
@@ -1,14 +0,0 @@
1
- <?php
2
- if ( ! defined( 'ABSPATH' ) ) {
3
- exit;
4
- }
5
- global $redux_builder_amp;
6
- if (!comments_open() || $redux_builder_amp['ampforwp-disqus-comments-support']) {
7
- return;
8
- } ?>
9
- <?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
10
- if( ! is_plugin_active( 'amp-comments/amp-comments.php' ) ) { ?>
11
- <div class="cmt-button-wrapper ampforwp-comment-button">
12
- <a href="<?php echo esc_url(ampforwp_comment_button_url()); ?>" rel="nofollow"><?php echo ampforwp_translation( $redux_builder_amp['amp-translator-leave-a-comment-text'], 'Leave a Comment' ); ?></a>
13
- </div>
14
- <?php } ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
templates/design-manager/design-1/style.php CHANGED
@@ -33,7 +33,7 @@ $cross_btn_bg_clr = ampforwp_get_setting('amp-d1-cross-bg-color','rgba');
33
  $cross_btn_hvr_clr = ampforwp_get_setting('amp-d1-cross-hover-color','rgba');
34
 
35
  if(empty($header_bg_clr)){
36
- $header_bg_clr ='#0a89c0';
37
  }
38
  if(empty($header_elements_clr)){
39
  $header_elements_clr ='#ffffff';
@@ -119,6 +119,7 @@ $icon_url = ampforwp_font_url($icon_url);
119
  amp-iframe{ max-width: 100%; margin-bottom : 20px; }
120
  amp-wistia-player {margin:5px 0px;}
121
  .hide{display:none}
 
122
  .amp-wp-article amp-addthis{bottom: -38px;}
123
  .amp-wp-content,.amp-wp-title-bar div {<?php if ( $content_max_width > 0 ) : ?> margin: 0 auto;max-width: <?php echo esc_attr(sprintf( '%dpx', $content_max_width )); ?>; <?php endif; if((is_singular() || ampforwp_is_front_page()) && checkAMPforPageBuilderStatus(ampforwp_get_the_ID())){?>
124
  max-width:100%;
@@ -307,7 +308,7 @@ if (empty($footer_txt_color)) {
307
  $footer_txt_color = '#353535';
308
  }
309
  if (empty($footer_link_color)) {
310
- $footer_link_color = '#0a89c0';
311
  }
312
  if (empty($footer_lnk_hvr_color)) {
313
  $footer_lnk_hvr_color = '#353535';
33
  $cross_btn_hvr_clr = ampforwp_get_setting('amp-d1-cross-hover-color','rgba');
34
 
35
  if(empty($header_bg_clr)){
36
+ $header_bg_clr ='#04415D';
37
  }
38
  if(empty($header_elements_clr)){
39
  $header_elements_clr ='#ffffff';
119
  amp-iframe{ max-width: 100%; margin-bottom : 20px; }
120
  amp-wistia-player {margin:5px 0px;}
121
  .hide{display:none}
122
+ div#pagination a {color: #04415D;}
123
  .amp-wp-article amp-addthis{bottom: -38px;}
124
  .amp-wp-content,.amp-wp-title-bar div {<?php if ( $content_max_width > 0 ) : ?> margin: 0 auto;max-width: <?php echo esc_attr(sprintf( '%dpx', $content_max_width )); ?>; <?php endif; if((is_singular() || ampforwp_is_front_page()) && checkAMPforPageBuilderStatus(ampforwp_get_the_ID())){?>
125
  max-width:100%;
308
  $footer_txt_color = '#353535';
309
  }
310
  if (empty($footer_link_color)) {
311
+ $footer_link_color = '#04415D';
312
  }
313
  if (empty($footer_lnk_hvr_color)) {
314
  $footer_lnk_hvr_color = '#353535';
templates/design-manager/design-2/elements/related-posts.php CHANGED
@@ -21,6 +21,7 @@ if( $current_post_type = get_post_type( $post )) {
21
  // The query arguments
22
  if($current_post_type != 'page'){
23
  $args = array(
 
24
  'posts_per_page'=> $int_number_of_related_posts,
25
  'post__not_in' => array($post->ID),
26
  'order' => 'DESC',
@@ -43,6 +44,7 @@ if($redux_builder_amp['ampforwp-single-select-type-of-related']==2){
43
  $category_ids = array();
44
  foreach($categories as $individual_category) $category_ids[] = $individual_category->term_id;
45
  $args=array(
 
46
  'category__in' => $category_ids,
47
  'posts_per_page' => $int_number_of_related_posts,
48
  'post__not_in' => array($post->ID),
@@ -67,6 +69,7 @@ if($redux_builder_amp['ampforwp-single-select-type-of-related']==1) {
67
  $tag_ids = array();
68
  foreach($ampforwp_tags as $individual_tag) $tag_ids[] = $individual_tag->term_id;
69
  $args=array(
 
70
  'tag__in' => $tag_ids,
71
  'posts_per_page' => $int_number_of_related_posts,
72
  'post__not_in' => array($post->ID),
21
  // The query arguments
22
  if($current_post_type != 'page'){
23
  $args = array(
24
+ 'fields'=>'ids',
25
  'posts_per_page'=> $int_number_of_related_posts,
26
  'post__not_in' => array($post->ID),
27
  'order' => 'DESC',
44
  $category_ids = array();
45
  foreach($categories as $individual_category) $category_ids[] = $individual_category->term_id;
46
  $args=array(
47
+ 'fields'=>'ids',
48
  'category__in' => $category_ids,
49
  'posts_per_page' => $int_number_of_related_posts,
50
  'post__not_in' => array($post->ID),
69
  $tag_ids = array();
70
  foreach($ampforwp_tags as $individual_tag) $tag_ids[] = $individual_tag->term_id;
71
  $args=array(
72
+ 'fields'=>'ids',
73
  'tag__in' => $tag_ids,
74
  'posts_per_page' => $int_number_of_related_posts,
75
  'post__not_in' => array($post->ID),
templates/design-manager/design-2/elements/simple-comment-button.php DELETED
@@ -1,14 +0,0 @@
1
- <?php
2
- if ( ! defined( 'ABSPATH' ) ) {
3
- exit;
4
- }
5
- global $redux_builder_amp;
6
- if (!comments_open() || $redux_builder_amp['ampforwp-disqus-comments-support'] || $redux_builder_amp['ampforwp-facebook-comments-support']) {
7
- return;
8
- } ?>
9
- <?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
10
- if( ! is_plugin_active( 'amp-comments/amp-comments.php' ) ) { ?>
11
- <div class="cmt-button-wrapper ampforwp-comment-button">
12
- <a href="<?php echo esc_url(ampforwp_comment_button_url()); ?>" rel="nofollow"><?php echo ampforwp_translation( $redux_builder_amp['amp-translator-leave-a-comment-text'], 'Leave a Comment' ); ?></a>
13
- </div>
14
- <?php } ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
templates/design-manager/design-2/style.php CHANGED
@@ -41,7 +41,7 @@ $cross_btn_bg_clr = ampforwp_get_setting('amp-d2-cross-bg-color','rgba');
41
  $cross_btn_hvr_clr = ampforwp_get_setting('amp-d2-cross-hover-color','rgba');
42
 
43
  if(empty($header_bg_clr)){
44
- $header_bg_clr ='#0a89c0';
45
  }
46
  if(empty($header_elements_clr)){
47
  $header_elements_clr ='#ffffff';
@@ -302,7 +302,7 @@ if (empty($footer_txt_color)) {
302
  $footer_txt_color = '#222222';
303
  }
304
  if (empty($footer_link_color)) {
305
- $footer_link_color = '#0a89c0';
306
  }
307
  if (empty($footer_brdr_color)) {
308
  $footer_brdr_color = '#eeeeee';
41
  $cross_btn_hvr_clr = ampforwp_get_setting('amp-d2-cross-hover-color','rgba');
42
 
43
  if(empty($header_bg_clr)){
44
+ $header_bg_clr ='#0074A7';
45
  }
46
  if(empty($header_elements_clr)){
47
  $header_elements_clr ='#ffffff';
302
  $footer_txt_color = '#222222';
303
  }
304
  if (empty($footer_link_color)) {
305
+ $footer_link_color = '#0074A7';
306
  }
307
  if (empty($footer_brdr_color)) {
308
  $footer_brdr_color = '#eeeeee';
templates/design-manager/design-3/elements/related-posts.php CHANGED
@@ -21,6 +21,7 @@ if( $current_post_type = get_post_type( $post )) {
21
  // The query arguments
22
  if($current_post_type != 'page'){
23
  $args = array(
 
24
  'posts_per_page'=> $int_number_of_related_posts,
25
  'post__not_in' => array($post->ID),
26
  'order' => 'DESC',
@@ -44,6 +45,7 @@ if($redux_builder_amp['ampforwp-single-select-type-of-related']==2){
44
  $category_ids = array();
45
  foreach($categories as $individual_category) $category_ids[] = $individual_category->term_id;
46
  $args=array(
 
47
  'category__in' => $category_ids,
48
  'posts_per_page' => $int_number_of_related_posts,
49
  'post__not_in' => array($post->ID),
@@ -68,6 +70,7 @@ if($redux_builder_amp['ampforwp-single-select-type-of-related']==1) {
68
  $tag_ids = array();
69
  foreach($ampforwp_tags as $individual_tag) $tag_ids[] = $individual_tag->term_id;
70
  $args=array(
 
71
  'tag__in' => $tag_ids,
72
 
73
  'posts_per_page' => $int_number_of_related_posts,
21
  // The query arguments
22
  if($current_post_type != 'page'){
23
  $args = array(
24
+ 'fields'=>'ids',
25
  'posts_per_page'=> $int_number_of_related_posts,
26
  'post__not_in' => array($post->ID),
27
  'order' => 'DESC',
45
  $category_ids = array();
46
  foreach($categories as $individual_category) $category_ids[] = $individual_category->term_id;
47
  $args=array(
48
+ 'fields'=>'ids',
49
  'category__in' => $category_ids,
50
  'posts_per_page' => $int_number_of_related_posts,
51
  'post__not_in' => array($post->ID),
70
  $tag_ids = array();
71
  foreach($ampforwp_tags as $individual_tag) $tag_ids[] = $individual_tag->term_id;
72
  $args=array(
73
+ 'fields'=>'ids',
74
  'tag__in' => $tag_ids,
75
 
76
  'posts_per_page' => $int_number_of_related_posts,
templates/design-manager/design-3/elements/simple-comment-button.php DELETED
@@ -1,15 +0,0 @@
1
- <?php
2
- if ( ! defined( 'ABSPATH' ) ) {
3
- exit;
4
- }
5
- global $redux_builder_amp;
6
- if (!comments_open() || $redux_builder_amp['ampforwp-disqus-comments-support'] || $redux_builder_amp['ampforwp-facebook-comments-support']) {
7
- return;
8
- } ?>
9
-
10
- <?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
11
- if( ! is_plugin_active( 'amp-comments/amp-comments.php' ) ) { ?>
12
- <div class="cmt-button-wrapper ampforwp-comment-button">
13
- <a href="<?php echo esc_url(ampforwp_comment_button_url()); ?>" rel="nofollow"><?php echo esc_attr(ampforwp_translation( $redux_builder_amp['amp-translator-leave-a-comment-text'], 'Leave a Comment' )); ?></a>
14
- </div>
15
- <?php } ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
templates/design-manager/design-3/style.php CHANGED
@@ -253,8 +253,8 @@ h2.amp-wp-title a ,h3.amp-wp-title a{ color: #000; }
253
  .amp-loop-list{ position:relative; border-bottom: 1px solid #ededed; padding: 25px 15px 25px 15px }
254
  body .amp-loop-list-noimg .amp-wp-post-content{ width:100% }
255
  .amp-loop-list .amp-wp-post-content{ float: left; width: 65%; }
256
- .amp-loop-list .featured_time{ color:#b3b3b3; padding-left:0 }
257
- .amp-wp-post-content p{ color: grey; line-height: 1.5; font-size: 14px;word-wrap: break-word; margin: 8px 0 10px;}
258
  <?php if ( is_single() && 1 == ampforwp_get_setting('enable-excerpt-single') ) { ?>
259
  /* For Excerpt */
260
  .amp-wp-post-content .small-screen-excerpt-design-3 {display: none;} .amp-wp-post-content .large-screen-excerpt-design-3 { display: block; }
@@ -289,7 +289,7 @@ if (empty($footer_cpr_color)) {
289
  $footer_cpr_color = '#ffffff';
290
  }
291
  if (empty($footer_pwrd_color)) {
292
- $footer_pwrd_color = '#666666';
293
  }
294
  ?>
295
  #footer{ background: <?php echo ampforwp_sanitize_color($footer_back_color);?>; color: <?php echo ampforwp_sanitize_color($footer_text_color);?>; font-size: 13px; text-align: center; letter-spacing: 0.2px; padding: 35px 0 35px 0; margin-top: 30px; }
253
  .amp-loop-list{ position:relative; border-bottom: 1px solid #ededed; padding: 25px 15px 25px 15px }
254
  body .amp-loop-list-noimg .amp-wp-post-content{ width:100% }
255
  .amp-loop-list .amp-wp-post-content{ float: left; width: 65%; }
256
+ .amp-loop-list .featured_time{ color:#561111; padding-left:0 }
257
+ .amp-wp-post-content p{ color: #3e3939; line-height: 1.5; font-size: 14px;word-wrap: break-word; margin: 8px 0 10px;}
258
  <?php if ( is_single() && 1 == ampforwp_get_setting('enable-excerpt-single') ) { ?>
259
  /* For Excerpt */
260
  .amp-wp-post-content .small-screen-excerpt-design-3 {display: none;} .amp-wp-post-content .large-screen-excerpt-design-3 { display: block; }
289
  $footer_cpr_color = '#ffffff';
290
  }
291
  if (empty($footer_pwrd_color)) {
292
+ $footer_pwrd_color = '#cac8c8';
293
  }
294
  ?>
295
  #footer{ background: <?php echo ampforwp_sanitize_color($footer_back_color);?>; color: <?php echo ampforwp_sanitize_color($footer_text_color);?>; font-size: 13px; text-align: center; letter-spacing: 0.2px; padding: 35px 0 35px 0; margin-top: 30px; }
templates/design-manager/swift/single.php CHANGED
@@ -20,7 +20,7 @@ global $redux_builder_amp; ?>
20
  <?php } ?>
21
  </div>
22
  <?php if ( ampforwp_get_setting('swift-featued-image') && ampforwp_has_post_thumbnail() ) { ?>
23
- <?php if ( ampforwp_get_setting('swift-featued-image-type') == 1) { ?>
24
  <div class="sf-img">
25
  <?php amp_featured_image();?>
26
  </div>
20
  <?php } ?>
21
  </div>
22
  <?php if ( ampforwp_get_setting('swift-featued-image') && ampforwp_has_post_thumbnail() ) { ?>
23
+ <?php if ( ampforwp_get_setting('swift-featued-image-type') == 1 || empty(ampforwp_get_setting('swift-featued-image-type')) ) { ?>
24
  <div class="sf-img">
25
  <?php amp_featured_image();?>
26
  </div>
templates/design-manager/swift/style.php CHANGED
@@ -94,6 +94,9 @@ amp-carousel > amp-img > img {object-fit: contain;}
94
  .amp-carousel-img img {object-fit: contain;}
95
  amp-instagram{box-sizing: initial;}
96
  figure.aligncenter amp-img {margin: 0 auto;}
 
 
 
97
  <?php global $post;
98
  if( class_exists('\Elementor\Plugin') && \Elementor\Plugin::$instance->db->is_built_with_elementor($post->ID) && (is_page() || ampforwp_is_front_page() ) && ( function_exists( 'amp_pagebuilder_compatibility_init' ) || class_exists('Elementor_For_Amp') ) ) { }
99
  else{ ?>.cntr {max-width: 1100px;margin: 0 auto;width:100%;padding:0px 20px} <?php } ?>
@@ -170,7 +173,7 @@ $callnowcolor = ampforwp_get_setting('amp-opt-color-rgba-colorscheme-call');
170
  <?php } ?>
171
  .h-ic{margin:0px 10px; align-self: center;}
172
  .amp-logo a{line-height:0;display:inline-block;<?php if(isset($redux_builder_amp['swift-element-color-control'] ['rgba']) && $redux_builder_amp['swift-element-color-control'] ['rgba']){?>color:<?php echo ampforwp_sanitize_color($redux_builder_amp['swift-element-color-control']['rgba'])?>;<?php } ?>}
173
- .logo <?php if(is_single()){ ?> h2 <?php } else{?>h1<?php }?>{margin: 0;font-size: 17px;font-weight: 700;text-transform: uppercase;display:inline-block;}
174
  .h-srch a{line-height:1;display:block;}
175
  .amp-logo amp-img{margin: 0 auto;}
176
  @media(max-width:480px){ .h-sing {font-size: 13px;} }
@@ -609,7 +612,12 @@ echo sanitize_text_field($fontFamily);
609
  ?>
610
  }
611
  <?php } ?>
612
- <?php if( ampforwp_get_setting('single-design-type') == '1' || ampforwp_get_setting('single-design-type') == '4' ){ ?>
 
 
 
 
 
613
  <?php // Single
614
 
615
  if(is_single() && !checkAMPforPageBuilderStatus(ampforwp_get_the_ID())) { ?>
@@ -835,7 +843,8 @@ letter-spacing: 0.10px;margin-top: 5px;font-weight: 400;}
835
  padding: 0px;
836
  margin: 0;
837
  }
838
- .rp .has_related_thumbnail{display: inline-flex;width: 29%;flex-direction: column;margin:0px 30px 30px 0px;justify-content: space-evenly;padding:0;}
 
839
  .rp .related_link p{word-break: break-word;color: #444;font-size: 13px;line-height: 20px;
840
  letter-spacing: 0.10px;margin-top: 5px;font-weight: 400;}
841
  .rp ol li::before{ content: " ";}
94
  .amp-carousel-img img {object-fit: contain;}
95
  amp-instagram{box-sizing: initial;}
96
  figure.aligncenter amp-img {margin: 0 auto;}
97
+ .rr span,.loop-date,.fbp-cnt .amp-author,.display-name{color:#191919;}
98
+ .fsp-cnt .loop-category li {padding: 8px 0px;}
99
+ .fbp-cnt h2.loop-title {padding: 8px 0px;}
100
  <?php global $post;
101
  if( class_exists('\Elementor\Plugin') && \Elementor\Plugin::$instance->db->is_built_with_elementor($post->ID) && (is_page() || ampforwp_is_front_page() ) && ( function_exists( 'amp_pagebuilder_compatibility_init' ) || class_exists('Elementor_For_Amp') ) ) { }
102
  else{ ?>.cntr {max-width: 1100px;margin: 0 auto;width:100%;padding:0px 20px} <?php } ?>
173
  <?php } ?>
174
  .h-ic{margin:0px 10px; align-self: center;}
175
  .amp-logo a{line-height:0;display:inline-block;<?php if(isset($redux_builder_amp['swift-element-color-control'] ['rgba']) && $redux_builder_amp['swift-element-color-control'] ['rgba']){?>color:<?php echo ampforwp_sanitize_color($redux_builder_amp['swift-element-color-control']['rgba'])?>;<?php } ?>}
176
+ .logo h1{margin: 0;font-size: 17px;font-weight: 700;text-transform: uppercase;display:inline-block;}
177
  .h-srch a{line-height:1;display:block;}
178
  .amp-logo amp-img{margin: 0 auto;}
179
  @media(max-width:480px){ .h-sing {font-size: 13px;} }
612
  ?>
613
  }
614
  <?php } ?>
615
+ <?php if( ampforwp_get_setting('single-design-type') == '1' || ampforwp_get_setting('single-design-type') == '4' ){
616
+ // Assigning Full size if feature img type is not set.
617
+ if( ampforwp_get_setting('swift-featued-image') && empty(ampforwp_get_setting('swift-featued-image-type'))){
618
+ $redux_builder_amp['swift-featued-image-type'] = 1;
619
+ }
620
+ ?>
621
  <?php // Single
622
 
623
  if(is_single() && !checkAMPforPageBuilderStatus(ampforwp_get_the_ID())) { ?>
843
  padding: 0px;
844
  margin: 0;
845
  }
846
+ .rp .has_related_thumbnail , .rp .no_related_thumbnail{display: inline-flex;width: 29%;flex-direction: column;margin:0px 30px 30px 0px;justify-content: space-evenly;padding:0;}
847
+ .rp .no_related_thumbnail{margin:0px;}
848
  .rp .related_link p{word-break: break-word;color: #444;font-size: 13px;line-height: 20px;
849
  letter-spacing: 0.10px;margin-top: 5px;font-weight: 400;}
850
  .rp ol li::before{ content: " ";}
templates/features.php CHANGED
@@ -2185,13 +2185,15 @@ function ampforwp_remove_bj_load() {
2185
  }
2186
  add_action( 'bjll/compat', 'ampforwp_remove_bj_load' );
2187
 
2188
- //Disable Crazy Lazy for AMP #751
2189
- function ampforwp_remove_crazy_lazy_support(){
 
2190
  if( ampforwp_is_amp_endpoint() ){
2191
  remove_action( 'wp', array( 'CrazyLazy', 'instance' ) );
2192
  }
 
 
2193
  }
2194
- add_action('wp','ampforwp_remove_crazy_lazy_support',9);
2195
  //33. Google tag manager support added
2196
  // Moved to analytics-functions.php
2197
 
@@ -2785,6 +2787,7 @@ function ampforwp_sidebar_content_sanitizer($sidebar){
2785
  if ( $non_sanitized_sidebar ) {
2786
  $sanitized_sidebar = new AMPforWP_Content( $non_sanitized_sidebar,
2787
  apply_filters( 'amp_content_embed_handlers', array(
 
2788
  'AMP_Twitter_Embed_Handler' => array(),
2789
  'AMP_YouTube_Embed_Handler' => array(),
2790
  'AMP_DailyMotion_Embed_Handler' => array(),
@@ -3187,6 +3190,7 @@ function ampforwp_content_sanitizer( $content ) {
3187
  if ( !empty( $amp_custom_post_content_input ) ) {
3188
  $amp_custom_content = new AMPFORWP_Content( $amp_custom_post_content_input,
3189
  apply_filters( 'amp_content_embed_handlers', array(
 
3190
  'AMP_Twitter_Embed_Handler' => array(),
3191
  'AMP_YouTube_Embed_Handler' => array(),
3192
  'AMP_Instagram_Embed_Handler' => array(),
@@ -3438,12 +3442,9 @@ function ampforwp_comment_button_url(){
3438
  add_action('pre_amp_render_post', 'ampforwp_remove_tagdiv_category_layout');
3439
  function ampforwp_remove_tagdiv_category_layout(){
3440
  if ( function_exists( 'ampforwp_is_amp_endpoint' ) && ampforwp_is_amp_endpoint() ) {
3441
- add_action('pre_get_posts','ampforwp_remove_support_tagdiv_cateroy_layout',9);
3442
  }
3443
  }
3444
- function ampforwp_remove_support_tagdiv_cateroy_layout(){
3445
- remove_action('pre_get_posts', 'td_modify_main_query_for_category_page');
3446
- }
3447
 
3448
  // 61. Add Gist Support
3449
  add_shortcode('amp-gist', 'ampforwp_gist_shortcode_generator');
@@ -3698,6 +3699,7 @@ function ampforwp_generate_pagebuilder_data() {
3698
 
3699
  $sanitized_sidebar = new AMPFORWP_Content( $non_sanitized_sidebar,
3700
  apply_filters( 'amp_content_embed_handlers', array(
 
3701
  'AMP_Twitter_Embed_Handler' => array(),
3702
  'AMP_YouTube_Embed_Handler' => array(),
3703
  'AMP_Instagram_Embed_Handler' => array(),
@@ -3802,30 +3804,19 @@ function ampforwp_remove_rel_on_bp(){
3802
  remove_action( 'wp_head', 'ampforwp_home_archive_rel_canonical', 1 );
3803
  }
3804
  }
 
 
 
 
 
 
 
 
 
3805
 
 
3806
  }
3807
 
3808
- // Removing AMP from WPForo Forums Pages #592
3809
-
3810
- add_action('amp_init','remove_rel_amp_from_forum');
3811
- function remove_rel_amp_from_forum(){
3812
- add_action('wp','ampforwp_remove_rel_on_forum');
3813
- }
3814
-
3815
- function ampforwp_remove_rel_on_forum(){
3816
- if(class_exists('wpForo')){
3817
- Global $post, $wpdb,$wpforo;
3818
- $foid = $post->ID;
3819
- $fid = $wpforo->pageid;
3820
- if($foid==$fid){
3821
- remove_action( 'wp_head', 'amp_frontend_add_canonical');
3822
- remove_action( 'wp_head', 'ampforwp_home_archive_rel_canonical', 1 );
3823
- }
3824
-
3825
- }
3826
- }
3827
-
3828
-
3829
  // 66. Make AMP compatible with Squirrly SEO
3830
  add_action('pre_amp_render_post','ampforwp_remove_sq_seo');
3831
  function ampforwp_remove_sq_seo() {
@@ -3884,7 +3875,7 @@ add_action('init', 'ampforwp_fb_instant_article_feed_generator');
3884
  function ampforwp_fb_instant_article_feed_generator() {
3885
  if( ampforwp_get_setting('fb-instant-article-switch') ) {
3886
  add_feed('instant_articles', 'ampforwp_fb_instant_article_feed_function');
3887
- add_action( 'wp_head', 'ampforwp_fbia_meta_tags' );
3888
  require AMPFORWP_PLUGIN_DIR . '/templates/instant-articles/instant-article-sanitizer.php';
3889
  }
3890
  }
@@ -4604,6 +4595,7 @@ if (! function_exists( 'ampforwp_get_body_class' ) ) {
4604
  }else{
4605
  $classes[] = get_post_type();
4606
  }
 
4607
  $classes = array_map( 'esc_attr', $classes );
4608
  $classes = apply_filters( 'ampforwp_body_class', $classes, $class );
4609
 
@@ -6086,13 +6078,13 @@ function ampforwp_homepage_loop( $args ) {
6086
  if ( is_home() ) {
6087
  $post_type = 'post';
6088
  // Check if Custom Post Type is selected
6089
- if ( isset($redux_builder_amp['ampforwp-homepage-loop-type']) && '' != $redux_builder_amp['ampforwp-homepage-loop-type'] ) {
6090
- $post_type = $redux_builder_amp['ampforwp-homepage-loop-type'];
6091
  }
6092
  $args['post_type'] = $post_type;
6093
  // Exclude Categories if any selected
6094
- if ( isset($redux_builder_amp['ampforwp-homepage-loop-cats']) && ! empty($redux_builder_amp['ampforwp-homepage-loop-cats']) ) {
6095
- $args['category__not_in'] = $redux_builder_amp['ampforwp-homepage-loop-cats'];
6096
  }
6097
  }
6098
  return $args;
@@ -6283,6 +6275,13 @@ function ampforwp_remove_instant_articles_amp_markup(){
6283
  if(class_exists('Instant_Articles_AMP_Markup')){
6284
  remove_action( 'wp_head', array('Instant_Articles_AMP_Markup', 'inject_link_rel') );
6285
  }
 
 
 
 
 
 
 
6286
  }
6287
  // #2042
6288
  function ampforwp_404_canonical(){
@@ -6313,18 +6312,6 @@ function ampforwp_paginated_post_content($content){
6313
  // GDPR Compliancy #2040
6314
  // Moved to notice-bar-functions.php
6315
 
6316
- // #1696
6317
- add_action('wp','ampforwp_remove_squirly_js');
6318
- function ampforwp_remove_squirly_js(){
6319
- if(function_exists('ampforwp_is_amp_endpoint') && ampforwp_is_amp_endpoint()){
6320
- if(class_exists('SQ_Classes_ObjController')){
6321
- $SQ_Classes_ObjController = new SQ_Classes_ObjController();
6322
- $sq_analytics_class_obj = $SQ_Classes_ObjController::getClass('SQ_Models_Services_Analytics');
6323
- }
6324
-
6325
- }
6326
- }
6327
-
6328
  // Thrive Leads Compatibility #2067
6329
  add_filter('thrive_leads_skip_request', 'ampforwp_skip_thrive_leads');
6330
  if ( ! function_exists('ampforwp_skip_thrive_leads') ) {
@@ -6432,11 +6419,7 @@ function ampforwp_get_comments_status(){
6432
  add_action('ampforwp_post_after_design_elements','ampforwp_vuukle_comments_support');
6433
  function ampforwp_vuukle_comments_support() {
6434
  global $redux_builder_amp;
6435
- if ( 4 != $redux_builder_amp['amp-design-selector']
6436
- && isset($redux_builder_amp['ampforwp-vuukle-comments-support'])
6437
- && $redux_builder_amp['ampforwp-vuukle-comments-support']==1
6438
- && comments_open()
6439
- ) {
6440
  echo ampforwp_vuukle_comments_markup();
6441
  }
6442
  }
@@ -6774,11 +6757,6 @@ function ampforwp_ia_meta_callback( $post ) {
6774
  </p>
6775
  <?php }
6776
 
6777
- // Removing Marfeel plugin which was blocking internal pages of AMP #2423
6778
- add_action('wp','ampforwp_remove_marfeel',9);
6779
- function ampforwp_remove_marfeel(){
6780
- remove_action('wp', 'render_marfeel_amp_content' );
6781
- }
6782
  // Total Plus compatibility #2511
6783
  add_action('current_screen', 'ampforwp_totalplus_comp_admin');
6784
  function ampforwp_totalplus_comp_admin() {
@@ -6941,6 +6919,7 @@ function ampforwp_comments_sanitizer(){
6941
  $comment_text = $comment_data->comment_content;
6942
  $comment_text = wpautop( $comment_text );
6943
  $sanitizer = new AMPforWP_Content( $comment_text, apply_filters( 'amp_content_embed_handlers', array(
 
6944
  'AMP_Twitter_Embed_Handler' => array(),
6945
  'AMP_YouTube_Embed_Handler' => array(),
6946
  'AMP_DailyMotion_Embed_Handler' => array(),
@@ -7353,7 +7332,7 @@ function ampforwp_yoast_breadcrumbs_output(){
7353
  if ( true == ampforwp_get_setting('ampforwp-yoast-bread-crumb') && true === WPSEO_Options::get( 'breadcrumbs-enable' ) && function_exists('yoast_breadcrumb')) {
7354
  $breadcrumb = yoast_breadcrumb('','', false);
7355
  if( true == ampforwp_get_setting('convert-internal-nonamplinks-to-amp') && preg_match('/<a\s+href="(.*?)">(.*?)<\/a>/', $breadcrumb)){
7356
- $breadcrumb = preg_replace('/<a\s+href="(.*?)\/">(.*?)<\/a>/', '<a href="$1/'.AMPFORWP_AMP_QUERY_VAR.'">$2</a>', $breadcrumb);
7357
  }
7358
  return $breadcrumb;
7359
  }
2185
  }
2186
  add_action( 'bjll/compat', 'ampforwp_remove_bj_load' );
2187
 
2188
+ add_action('wp','ampforwp_remove_wp_actions',9);
2189
+ function ampforwp_remove_wp_actions(){
2190
+ //Disable Crazy Lazy for AMP #751
2191
  if( ampforwp_is_amp_endpoint() ){
2192
  remove_action( 'wp', array( 'CrazyLazy', 'instance' ) );
2193
  }
2194
+ // Removing Marfeel plugin which was blocking internal pages of AMP #2423
2195
+ remove_action('wp', 'render_marfeel_amp_content' );
2196
  }
 
2197
  //33. Google tag manager support added
2198
  // Moved to analytics-functions.php
2199
 
2787
  if ( $non_sanitized_sidebar ) {
2788
  $sanitized_sidebar = new AMPforWP_Content( $non_sanitized_sidebar,
2789
  apply_filters( 'amp_content_embed_handlers', array(
2790
+ 'AMP_Reddit_Embed_Handler' => array(),
2791
  'AMP_Twitter_Embed_Handler' => array(),
2792
  'AMP_YouTube_Embed_Handler' => array(),
2793
  'AMP_DailyMotion_Embed_Handler' => array(),
3190
  if ( !empty( $amp_custom_post_content_input ) ) {
3191
  $amp_custom_content = new AMPFORWP_Content( $amp_custom_post_content_input,
3192
  apply_filters( 'amp_content_embed_handlers', array(
3193
+ 'AMP_Reddit_Embed_Handler' => array(),
3194
  'AMP_Twitter_Embed_Handler' => array(),
3195
  'AMP_YouTube_Embed_Handler' => array(),
3196
  'AMP_Instagram_Embed_Handler' => array(),
3442
  add_action('pre_amp_render_post', 'ampforwp_remove_tagdiv_category_layout');
3443
  function ampforwp_remove_tagdiv_category_layout(){
3444
  if ( function_exists( 'ampforwp_is_amp_endpoint' ) && ampforwp_is_amp_endpoint() ) {
3445
+ remove_action('pre_get_posts', 'td_modify_main_query_for_category_page',9);
3446
  }
3447
  }
 
 
 
3448
 
3449
  // 61. Add Gist Support
3450
  add_shortcode('amp-gist', 'ampforwp_gist_shortcode_generator');
3699
 
3700
  $sanitized_sidebar = new AMPFORWP_Content( $non_sanitized_sidebar,
3701
  apply_filters( 'amp_content_embed_handlers', array(
3702
+ 'AMP_Reddit_Embed_Handler' => array(),
3703
  'AMP_Twitter_Embed_Handler' => array(),
3704
  'AMP_YouTube_Embed_Handler' => array(),
3705
  'AMP_Instagram_Embed_Handler' => array(),
3804
  remove_action( 'wp_head', 'ampforwp_home_archive_rel_canonical', 1 );
3805
  }
3806
  }
3807
+ // Removing AMP from WPForo Forums Pages #592
3808
+ if(class_exists('wpForo')){
3809
+ Global $post, $wpdb,$wpforo;
3810
+ $foid = $post->ID;
3811
+ $fid = $wpforo->pageid;
3812
+ if($foid==$fid){
3813
+ remove_action( 'wp_head', 'amp_frontend_add_canonical');
3814
+ remove_action( 'wp_head', 'ampforwp_home_archive_rel_canonical', 1 );
3815
+ }
3816
 
3817
+ }
3818
  }
3819
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3820
  // 66. Make AMP compatible with Squirrly SEO
3821
  add_action('pre_amp_render_post','ampforwp_remove_sq_seo');
3822
  function ampforwp_remove_sq_seo() {
3875
  function ampforwp_fb_instant_article_feed_generator() {
3876
  if( ampforwp_get_setting('fb-instant-article-switch') ) {
3877
  add_feed('instant_articles', 'ampforwp_fb_instant_article_feed_function');
3878
+ add_action( 'ampforwp_fbia_head', 'ampforwp_fbia_meta_tags' );
3879
  require AMPFORWP_PLUGIN_DIR . '/templates/instant-articles/instant-article-sanitizer.php';
3880
  }
3881
  }
4595
  }else{
4596
  $classes[] = get_post_type();
4597
  }
4598
+ $classes[] = AMPFORWP_VERSION;
4599
  $classes = array_map( 'esc_attr', $classes );
4600
  $classes = apply_filters( 'ampforwp_body_class', $classes, $class );
4601
 
6078
  if ( is_home() ) {
6079
  $post_type = 'post';
6080
  // Check if Custom Post Type is selected
6081
+ if ('' != ampforwp_get_setting('ampforwp-homepage-loop-type') ) {
6082
+ $post_type = ampforwp_get_setting('ampforwp-homepage-loop-type');
6083
  }
6084
  $args['post_type'] = $post_type;
6085
  // Exclude Categories if any selected
6086
+ if ('' != ampforwp_get_setting('ampforwp-homepage-loop-cats') ) {
6087
+ $args['category__not_in'] = ampforwp_get_setting('ampforwp-homepage-loop-cats');
6088
  }
6089
  }
6090
  return $args;
6275
  if(class_exists('Instant_Articles_AMP_Markup')){
6276
  remove_action( 'wp_head', array('Instant_Articles_AMP_Markup', 'inject_link_rel') );
6277
  }
6278
+ // #1696
6279
+ if(function_exists('ampforwp_is_amp_endpoint') && ampforwp_is_amp_endpoint()){
6280
+ if(class_exists('SQ_Classes_ObjController')){
6281
+ $SQ_Classes_ObjController = new SQ_Classes_ObjController();
6282
+ $sq_analytics_class_obj = $SQ_Classes_ObjController::getClass('SQ_Models_Services_Analytics');
6283
+ }
6284
+ }
6285
  }
6286
  // #2042
6287
  function ampforwp_404_canonical(){
6312
  // GDPR Compliancy #2040
6313
  // Moved to notice-bar-functions.php
6314
 
 
 
 
 
 
 
 
 
 
 
 
 
6315
  // Thrive Leads Compatibility #2067
6316
  add_filter('thrive_leads_skip_request', 'ampforwp_skip_thrive_leads');
6317
  if ( ! function_exists('ampforwp_skip_thrive_leads') ) {
6419
  add_action('ampforwp_post_after_design_elements','ampforwp_vuukle_comments_support');
6420
  function ampforwp_vuukle_comments_support() {
6421
  global $redux_builder_amp;
6422
+ if ( true == ampforwp_get_setting('ampforwp-vuukle-comments-support') && comments_open()) {
 
 
 
 
6423
  echo ampforwp_vuukle_comments_markup();
6424
  }
6425
  }
6757
  </p>
6758
  <?php }
6759
 
 
 
 
 
 
6760
  // Total Plus compatibility #2511
6761
  add_action('current_screen', 'ampforwp_totalplus_comp_admin');
6762
  function ampforwp_totalplus_comp_admin() {
6919
  $comment_text = $comment_data->comment_content;
6920
  $comment_text = wpautop( $comment_text );
6921
  $sanitizer = new AMPforWP_Content( $comment_text, apply_filters( 'amp_content_embed_handlers', array(
6922
+ 'AMP_Reddit_Embed_Handler' => array(),
6923
  'AMP_Twitter_Embed_Handler' => array(),
6924
  'AMP_YouTube_Embed_Handler' => array(),
6925
  'AMP_DailyMotion_Embed_Handler' => array(),
7332
  if ( true == ampforwp_get_setting('ampforwp-yoast-bread-crumb') && true === WPSEO_Options::get( 'breadcrumbs-enable' ) && function_exists('yoast_breadcrumb')) {
7333
  $breadcrumb = yoast_breadcrumb('','', false);
7334
  if( true == ampforwp_get_setting('convert-internal-nonamplinks-to-amp') && preg_match('/<a\s+href="(.*?)">(.*?)<\/a>/', $breadcrumb)){
7335
+ $breadcrumb = preg_replace('/<a\s+href="(.*?)\/">(.*?)<\/a>/', '<a href="$1/'.user_trailingslashit(AMPFORWP_AMP_QUERY_VAR).'">$2</a>', $breadcrumb);
7336
  }
7337
  return $breadcrumb;
7338
  }
templates/template-mode/template-mode.php CHANGED
@@ -614,6 +614,7 @@ Class AMPforWP_theme_mode{
614
  $sanitizer_obj = new AMPFORWP_Content( $content,
615
  apply_filters( 'amp_content_embed_handlers_template_mode', array(
616
  'AMP_Core_Block_Handler' => array(),
 
617
  'AMP_Twitter_Embed_Handler' => array(),
618
  'AMP_YouTube_Embed_Handler' => array(),
619
  'AMP_DailyMotion_Embed_Handler' => array(),
614
  $sanitizer_obj = new AMPFORWP_Content( $content,
615
  apply_filters( 'amp_content_embed_handlers_template_mode', array(
616
  'AMP_Core_Block_Handler' => array(),
617
+ 'AMP_Reddit_Embed_Handler' => array(),
618
  'AMP_Twitter_Embed_Handler' => array(),
619
  'AMP_YouTube_Embed_Handler' => array(),
620
  'AMP_DailyMotion_Embed_Handler' => array(),
uninstall.php CHANGED
@@ -72,5 +72,6 @@ if(isset($redux_builder_amp['ampforwp-delete-on-uninstall']) && $redux_builder_a
72
  }
73
  }
74
  delete_option('ampforwp_option_panel_view_type');
 
75
  }
76
  }
72
  }
73
  }
74
  delete_option('ampforwp_option_panel_view_type');
75
+ delete_option("ampforwp_feedback_remove_notice");
76
  }
77
  }