AMP for WP – Accelerated Mobile Pages - Version 1.0.64

Version Description

(5th October 2020) = * Fixed: Comments module of AMP pagebuilder is rendering only admin comments not the others #4745 * Fixed: Shortpixel is not generating WebP in AMP #4738 * Fixed: SEO option appearing in wordpress tool bar even No SEO plugin is active #4698 * Fixed: Auto add amp in menu url functionality is not working in tags #4734 * Fixed: The internal link for the the author page is generating in the AMP if the archive page support is disabled #4746 * Fixed: Scroll to top button not visible in Design 2 #4693 * Fixed: Notice: Undefined index: Cpage #4728 * Fixed: GDPR banner is off-centered, the 'X 'is out of the screen #4724 * Fixed: Wrong AMP html when the AMP takeover and ?amp is enabled #4731 * Fixed: Addon mode forcefully redirecting to reader mode not others #4742 * Fixed: Images not appearing with Image Photo Gallery Final Tiles Grid plugin #4675 * Fixed: In Design three, when click on the menu, the page gets pushed to the right side #4736 * Fixed: FAQ icon button is a too big in amp page. #4747 * Fixed: Added meta name="referrer" content="no-referrer-when-downgrade" #4715 * Fixed: In admin tool bar, (+) icon loading small and also author image invisible #4700 * Fixed: Issue with menu background when user add internal page navigation menu-items. #4630 * Fixed: Anchor tag getting stripped when Site Kit by Google is active. #4699 * Fixed: Merriweather font option in Design 1 does not work. #4726 * Fixed: If the user is adding the HTML code in the background video module then code is showing as output #4755 * Fixed: AMP 404 template is applying on non amp page #4723 * Fixed: In-Content Related Post appearing inside the blockquote when "After 50% of content" option is selected #4743 * Fixed: If the sticky ads is active then the sticky social share link tab is hiding behind the ads #4749

Download this release

Release Info

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

Code changes from version 1.0.63 to 1.0.64

Files changed (22) hide show
  1. README.md +25 -20
  2. accelerated-moblie-pages.php +5 -3
  3. changelog.txt +24 -0
  4. classes/class-ampforwp-walker-nav-menu.php +10 -0
  5. components/author-box/author-box.php +1 -1
  6. components/components-core.php +13 -1
  7. components/gdpr/gdpr.php +1 -1
  8. includes/features/functions.php +7 -1
  9. includes/thirdparty-compatibility.php +7 -0
  10. includes/vendor/amp/amp.php +8 -3
  11. pagebuilder/inc/viewShowFrontData.php +2 -2
  12. pagebuilder/modules/comments-module.php +1 -3
  13. readme.txt +25 -20
  14. templates/design-manager/design-1/footer.php +1 -2
  15. templates/design-manager/design-1/style.php +5 -1
  16. templates/design-manager/design-2/footer.php +3 -6
  17. templates/design-manager/design-3/footer.php +1 -3
  18. templates/design-manager/design-3/style.php +2 -0
  19. templates/design-manager/swift/header.php +3 -3
  20. templates/design-manager/swift/style.php +1 -1
  21. templates/features.php +39 -10
  22. templates/template-mode/admin-bar.css +1 -1
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.63
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -193,6 +193,30 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
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
@@ -218,23 +242,4 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
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
220
 
221
- = 1.0.62.1 (17th August 2020) =
222
- * Improvement: Removed unwanted javascript from AMP pages #4689
223
- * Fixed: Call to undefined function fifu_amp_url() #4688
224
- * Fixed: jQuery.fn.live() is deprecated warnings #4706
225
-
226
- = 1.0.62 (15th August 2020) =
227
- * Improvement: Added Yoast Local SEO plugin compatibility #4170
228
- * Improvement: Added option for changing the tags for the accordion module in AMP Page Builder #4208
229
- * Improvement: Added option for showing primary category of Yoast #4495
230
- * Improvement: Added condition for adding infinite scroll in AMP Woocommerce #4673
231
- * Improvement: Added excerpt option in in-content related posts #3981
232
- * Fixed: AMP not working on the Homepage with WP Ultimate recipe plugin #4538
233
- * Fixed: CSS overiding issue for the list and accourdion modules in AMP Page Builder #4674
234
- * Fixed: Alignment issue on homepage in design one #4676
235
- * Fixed: Debug Errors #4671
236
-
237
- = 1.0.61.2 (5th August 2020) =
238
- * Fixed: Removed Helpscout Beacon from Options Panel #4682
239
-
240
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.5
7
+ Stable tag: 1.0.64
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.64 (5th October 2020) =
197
+ * Fixed: Comments module of AMP pagebuilder is rendering only admin comments not the others #4745
198
+ * Fixed: Shortpixel is not generating WebP in AMP #4738
199
+ * Fixed: SEO option appearing in wordpress tool bar even No SEO plugin is active #4698
200
+ * Fixed: Auto add amp in menu url functionality is not working in tags #4734
201
+ * Fixed: The internal link for the the author page is generating in the AMP if the archive page support is disabled #4746
202
+ * Fixed: Scroll to top button not visible in Design 2 #4693
203
+ * Fixed: Notice: Undefined index: Cpage #4728
204
+ * Fixed: GDPR banner is off-centered, the 'X 'is out of the screen #4724
205
+ * Fixed: Wrong AMP html when the AMP takeover and ?amp is enabled #4731
206
+ * Fixed: Addon mode forcefully redirecting to reader mode not others #4742
207
+ * Fixed: Images not appearing with Image Photo Gallery Final Tiles Grid plugin #4675
208
+ * Fixed: In Design three, when click on the menu, the page gets pushed to the right side #4736
209
+ * Fixed: FAQ icon button is a too big in amp page. #4747
210
+ * Fixed: Added meta name="referrer" content="no-referrer-when-downgrade" #4715
211
+ * Fixed: In admin tool bar, (+) icon loading small and also author image invisible #4700
212
+ * Fixed: Issue with menu background when user add internal page navigation menu-items. #4630
213
+ * Fixed: Anchor tag getting stripped when Site Kit by Google is active. #4699
214
+ * Fixed: Merriweather font option in Design 1 does not work. #4726
215
+ * Fixed: If the user is adding the HTML code in the background video module then code is showing as output #4755
216
+ * Fixed: AMP 404 template is applying on non amp page #4723
217
+ * Fixed: In-Content Related Post appearing inside the blockquote when "After 50% of content" option is selected #4743
218
+ * Fixed: If the sticky ads is active then the sticky social share link tab is hiding behind the ads #4749
219
+
220
  = 1.0.63 (26th September 2020) =
221
  * Improvement: Added Reddit embeds support #4406
222
  * Improvement: Added multi select for post type in loop field #4365
242
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
243
  * Fixed: Validation error - accordion section must have 2 child tags #4208
244
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
245
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
accelerated-moblie-pages.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
- Version: 1.0.63
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.63');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
@@ -1061,7 +1061,9 @@ function ampforwp_get_all_post_types(){
1061
  if( ampforwp_get_setting('ampforwp-archive-support') && ampforwp_get_setting('ampforwp-archive-support-cat') ){
1062
  $post_types['category'] = 'category';
1063
  }
1064
-
 
 
1065
  $custom_taxonomies = ampforwp_get_setting('ampforwp-custom-taxonomies');
1066
  if(ampforwp_get_setting('ampforwp-archive-support') && !empty($custom_taxonomies) ){
1067
  foreach($custom_taxonomies as $taxonomy){
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.64
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.64');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
1061
  if( ampforwp_get_setting('ampforwp-archive-support') && ampforwp_get_setting('ampforwp-archive-support-cat') ){
1062
  $post_types['category'] = 'category';
1063
  }
1064
+ if( ampforwp_get_setting('ampforwp-archive-support') && ampforwp_get_setting('ampforwp-archive-support-tag')){
1065
+ $post_types['tag'] = 'post_tag';
1066
+ }
1067
  $custom_taxonomies = ampforwp_get_setting('ampforwp-custom-taxonomies');
1068
  if(ampforwp_get_setting('ampforwp-archive-support') && !empty($custom_taxonomies) ){
1069
  foreach($custom_taxonomies as $taxonomy){
changelog.txt CHANGED
@@ -1,5 +1,29 @@
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
1
  == Changelog ==
2
 
3
+ = 1.0.64 (5th October 2020) =
4
+ * Fixed: Comments module of AMP pagebuilder is rendering only admin comments not the others #4745
5
+ * Fixed: Shortpixel is not generating WebP in AMP #4738
6
+ * Fixed: SEO option appearing in wordpress tool bar even No SEO plugin is active #4698
7
+ * Fixed: Auto add amp in menu url functionality is not working in tags #4734
8
+ * Fixed: The internal link for the the author page is generating in the AMP if the archive page support is disabled #4746
9
+ * Fixed: Scroll to top button not visible in Design 2 #4693
10
+ * Fixed: Notice: Undefined index: Cpage #4728
11
+ * Fixed: GDPR banner is off-centered, the 'X 'is out of the screen #4724
12
+ * Fixed: Wrong AMP html when the AMP takeover and ?amp is enabled #4731
13
+ * Fixed: Addon mode forcefully redirecting to reader mode not others #4742
14
+ * Fixed: Images not appearing with Image Photo Gallery Final Tiles Grid plugin #4675
15
+ * Fixed: In Design three, when click on the menu, the page gets pushed to the right side #4736
16
+ * Fixed: FAQ icon button is a too big in amp page. #4747
17
+ * Fixed: Added meta name="referrer" content="no-referrer-when-downgrade" #4715
18
+ * Fixed: In admin tool bar, (+) icon loading small and also author image invisible #4700
19
+ * Fixed: Issue with menu background when user add internal page navigation menu-items. #4630
20
+ * Fixed: Anchor tag getting stripped when Site Kit by Google is active. #4699
21
+ * Fixed: Merriweather font option in Design 1 does not work. #4726
22
+ * Fixed: If the user is adding the HTML code in the background video module then code is showing as output #4755
23
+ * Fixed: AMP 404 template is applying on non amp page #4723
24
+ * Fixed: In-Content Related Post appearing inside the blockquote when "After 50% of content" option is selected #4743
25
+ * Fixed: If the sticky ads is active then the sticky social share link tab is hiding behind the ads #4749
26
+
27
  = 1.0.63 (26th September 2020) =
28
  * Improvement: Added Reddit embeds support #4406
29
  * Improvement: Added multi select for post type in loop field #4365
classes/class-ampforwp-walker-nav-menu.php CHANGED
@@ -39,6 +39,12 @@ if ( ! defined( 'ABSPATH' ) ) {
39
  if($item->url=="" || $item->url=="#"){
40
  $lmenu = "link-menu";
41
  }
 
 
 
 
 
 
42
  $class_names = ' class="' . esc_attr( $class_names ) . ' '.esc_attr($lmenu).'"';
43
 
44
  $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args, $depth );
@@ -59,6 +65,10 @@ if ( ! defined( 'ABSPATH' ) ) {
59
  $attributes .= ! empty( $item->target ) ? ' target="' . esc_attr( $atts['target'] ) .'"' : '';
60
  $attributes .= ! empty( $item->xfn ) ? ' rel="' . esc_attr( $atts['rel'] ) .'"' : '';
61
  $attributes .= ! empty( $item->url ) ? ' href="' . esc_attr( $atts['href'] ) .'"' : '';
 
 
 
 
62
 
63
  // Check if menu item is in main menu
64
  if ( $depth == 0 && $has_children > 0 ) {
39
  if($item->url=="" || $item->url=="#"){
40
  $lmenu = "link-menu";
41
  }
42
+ $jump_link = false;
43
+ $parse_url = wp_parse_url($item->url);
44
+ if( function_exists('ampforwp_get_setting') && ampforwp_get_setting('amp-design-selector') == 4 && (strpos($item->url, '#') === 0 || isset($parse_url['fragment']) ) ){
45
+ $jump_link = true;
46
+ }
47
+
48
  $class_names = ' class="' . esc_attr( $class_names ) . ' '.esc_attr($lmenu).'"';
49
 
50
  $id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args, $depth );
65
  $attributes .= ! empty( $item->target ) ? ' target="' . esc_attr( $atts['target'] ) .'"' : '';
66
  $attributes .= ! empty( $item->xfn ) ? ' rel="' . esc_attr( $atts['rel'] ) .'"' : '';
67
  $attributes .= ! empty( $item->url ) ? ' href="' . esc_attr( $atts['href'] ) .'"' : '';
68
+
69
+ if($jump_link == true){
70
+ $attributes .= 'on="tap:AMP.setState({ offcanvas_menu: false })" role="button " tabindex="0"';
71
+ }
72
 
73
  // Check if menu item is in main menu
74
  if ( $depth == 0 && $has_children > 0 ) {
components/author-box/author-box.php CHANGED
@@ -115,7 +115,7 @@ if ( isset($args['show_time']) ) {
115
  }
116
  else {
117
  if( $author_pub_name ){
118
- if($is_author_link_amp==true){
119
  $author_link = ampforwp_url_controller($author_link);
120
  }
121
  echo '<span class="author-name">' .esc_html($author_prefix) . ' <a href="'. esc_url($author_link).'" title="'. esc_html($author_name).'"> ' .esc_html( $author_name ).'</a></span>';
115
  }
116
  else {
117
  if( $author_pub_name ){
118
+ if($is_author_link_amp==true && ampforwp_get_setting('ampforwp-archive-support')){
119
  $author_link = ampforwp_url_controller($author_link);
120
  }
121
  echo '<span class="author-name">' .esc_html($author_prefix) . ' <a href="'. esc_url($author_link).'" title="'. esc_html($author_name).'"> ' .esc_html( $author_name ).'</a></span>';
components/components-core.php CHANGED
@@ -444,7 +444,6 @@ function amp_footer_core(){
444
  do_action('ampforwp_global_after_footer');
445
  do_action('amp_end',$thisTemplate);
446
  }
447
- amp_back_to_top_link();
448
  // Close the body and Html tags ?>
449
  </body>
450
  </html><?php
@@ -704,6 +703,9 @@ function ampforwp_backtotop_global_css(){?>
704
  sub {vertical-align: sub;font-size: small;}
705
  sup {vertical-align: super;font-size: small;}
706
  amp-call-tracking a {display: none;}
 
 
 
707
  <?php if( true == ampforwp_get_setting('ampforwp-footer-top') ) { ?>
708
  .btt{
709
  position: fixed;
@@ -718,6 +720,7 @@ function ampforwp_backtotop_global_css(){?>
718
  border-radius: 100%;
719
  width: 50px;
720
  height: 50px;
 
721
  }
722
  .btt:hover{color:#fff;background:#474747;}
723
  .btt:before{
@@ -805,4 +808,13 @@ function ampforwp_addthis_floating_social_share(){
805
  }
806
  }
807
  }
 
 
 
 
 
 
 
 
 
808
  }
444
  do_action('ampforwp_global_after_footer');
445
  do_action('amp_end',$thisTemplate);
446
  }
 
447
  // Close the body and Html tags ?>
448
  </body>
449
  </html><?php
703
  sub {vertical-align: sub;font-size: small;}
704
  sup {vertical-align: super;font-size: small;}
705
  amp-call-tracking a {display: none;}
706
+ <?php if (class_exists('UAGB_Admin')) {?>
707
+ .wp-block-uagb-faq svg {display: none;}
708
+ <?php } ?>
709
  <?php if( true == ampforwp_get_setting('ampforwp-footer-top') ) { ?>
710
  .btt{
711
  position: fixed;
720
  border-radius: 100%;
721
  width: 50px;
722
  height: 50px;
723
+ text-decoration: none;
724
  }
725
  .btt:hover{color:#fff;background:#474747;}
726
  .btt:before{
808
  }
809
  }
810
  }
811
+
812
+ // Added json for amp sidebar menu checkbox
813
+ if( ampforwp_get_setting('amp-design-selector') == 4){ ?>
814
+ <amp-state id="sidemenu">
815
+ <script type="application/json">
816
+ <?php echo json_encode(array('offcanvas_menu'=> false));?>
817
+ </script>
818
+ </amp-state>
819
+ <?php }
820
  }
components/gdpr/gdpr.php CHANGED
@@ -133,7 +133,7 @@ function ampforwp_gdpr_css(){
133
  .gdpr_w{width: 85%;margin:0 auto;padding:1.5rem;}
134
  }
135
  @media(max-width:700px){
136
- .gdpr_w{margin:0 auto; width: 95%;}
137
 
138
  }<?php
139
  } // GDPR Type 1 End
133
  .gdpr_w{width: 85%;margin:0 auto;padding:1.5rem;}
134
  }
135
  @media(max-width:700px){
136
+ .gdpr_w{margin:0 auto; width: 85%;}
137
 
138
  }<?php
139
  } // GDPR Type 1 End
includes/features/functions.php CHANGED
@@ -508,7 +508,13 @@ if ( ! function_exists( 'ampforwp_isexternal ') ) {
508
  if(!function_exists('ampforwp_findInternalUrl')){
509
  function ampforwp_findInternalUrl($url){
510
  if(function_exists('googlesitekit_activate_plugin')){
511
- $url = remove_query_arg( '_gl', $url);
 
 
 
 
 
 
512
  }
513
  global $redux_builder_amp;
514
  if(isset($redux_builder_amp['convert-internal-nonamplinks-to-amp']) && ! $redux_builder_amp['convert-internal-nonamplinks-to-amp']){
508
  if(!function_exists('ampforwp_findInternalUrl')){
509
  function ampforwp_findInternalUrl($url){
510
  if(function_exists('googlesitekit_activate_plugin')){
511
+ if(strpos($url, '_gl') !== false){
512
+ $url = remove_query_arg( '_gl', $url);
513
+ //remove ? from jump links.
514
+ if(strpos($url, '?#') === 0){
515
+ $url = str_replace('?#', '#', $url);
516
+ }
517
+ }
518
  }
519
  global $redux_builder_amp;
520
  if(isset($redux_builder_amp['convert-internal-nonamplinks-to-amp']) && ! $redux_builder_amp['convert-internal-nonamplinks-to-amp']){
includes/thirdparty-compatibility.php CHANGED
@@ -68,6 +68,9 @@ function ampforwp_thirdparty_compatibility(){
68
  if(function_exists('vicomi_feelbacks_template')){
69
  remove_action('the_content', 'vicomi_feelbacks_template');
70
  }
 
 
 
71
  $yoast_canonical = $yoast_canonical_post = $yoast_canonical_page = '';
72
  $yoast_canonical = get_option( 'wpseo_titles' );
73
  if(isset($yoast_canonical['noindex-post'])){
@@ -1225,4 +1228,8 @@ function ampforwp_show_yoast_seo_local_map($content){
1225
  $content = preg_replace('/<div id="wpseo-directions-wrapper">(.*?)<\/div>/s','', $content);
1226
  }
1227
  return $content;
 
 
 
 
1228
  }
68
  if(function_exists('vicomi_feelbacks_template')){
69
  remove_action('the_content', 'vicomi_feelbacks_template');
70
  }
71
+ if(class_exists('FinalTiles_Gallery')){
72
+ add_filter('wp_is_mobile','ampforwp_final_tiles_grid_gallery');
73
+ }
74
  $yoast_canonical = $yoast_canonical_post = $yoast_canonical_page = '';
75
  $yoast_canonical = get_option( 'wpseo_titles' );
76
  if(isset($yoast_canonical['noindex-post'])){
1228
  $content = preg_replace('/<div id="wpseo-directions-wrapper">(.*?)<\/div>/s','', $content);
1229
  }
1230
  return $content;
1231
+ }
1232
+ function ampforwp_final_tiles_grid_gallery($mobile){
1233
+ $mobile = false;
1234
+ return $mobile;
1235
  }
includes/vendor/amp/amp.php CHANGED
@@ -80,12 +80,16 @@ if ( ! function_exists('AMPforWP\\AMPVendor\\amp_prepare_render') ) {
80
  }
81
  if ( ! function_exists('AMPforWP\\AMPVendor\\amp_render') ) {
82
  function amp_render() {
83
- global $ampforwpTemplate;
84
  amp_load_classes();
85
-
86
  $post_id = get_queried_object_id();
87
  do_action( 'pre_amp_render_post', $post_id );
88
-
 
 
 
 
 
 
89
  amp_add_post_template_actions();
90
  $template = $ampforwpTemplate = new AMP_Post_Template( $post_id );
91
  $template->load();
@@ -94,6 +98,7 @@ if ( ! function_exists('AMPforWP\\AMPVendor\\amp_render') ) {
94
  header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
95
  }
96
  exit;
 
97
  }
98
  }
99
  /**
80
  }
81
  if ( ! function_exists('AMPforWP\\AMPVendor\\amp_render') ) {
82
  function amp_render() {
 
83
  amp_load_classes();
 
84
  $post_id = get_queried_object_id();
85
  do_action( 'pre_amp_render_post', $post_id );
86
+ $post = get_queried_object();
87
+ if ( $post instanceof WP_Post && function_exists('amp_activate')) {
88
+ amp_render_post( $post );
89
+ exit;
90
+ }
91
+ if ( !function_exists('amp_activate')) {
92
+ global $ampforwpTemplate;
93
  amp_add_post_template_actions();
94
  $template = $ampforwpTemplate = new AMP_Post_Template( $post_id );
95
  $template->load();
98
  header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
99
  }
100
  exit;
101
+ }
102
  }
103
  }
104
  /**
pagebuilder/inc/viewShowFrontData.php CHANGED
@@ -614,12 +614,12 @@ function amppb_post_content($content){
614
  }elseif($field['name']=='grid_type' && $rowsData['data'][$field['name']]=='amppb-fixed'){
615
  $replace .= 'ap-fi';
616
  }else{
617
- $replace .= esc_html($rowsData['data'][$field['name']]);
 
618
  }
619
  }else{
620
  $replace .= '';
621
  }
622
- $replace = esc_attr($replace);
623
  if(! is_array($field['name']) && $field['content_type']=='html'){
624
  $rowStartTemplate = str_replace('{{'.$field['name'].'}}', $replace, $rowStartTemplate);
625
  }
614
  }elseif($field['name']=='grid_type' && $rowsData['data'][$field['name']]=='amppb-fixed'){
615
  $replace .= 'ap-fi';
616
  }else{
617
+ $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span><div>';
618
+ $replace .= strip_tags($rowsData['data'][$field['name']],$allowed_tags);
619
  }
620
  }else{
621
  $replace .= '';
622
  }
 
623
  if(! is_array($field['name']) && $field['content_type']=='html'){
624
  $rowStartTemplate = str_replace('{{'.$field['name'].'}}', $replace, $rowStartTemplate);
625
  }
pagebuilder/modules/comments-module.php CHANGED
@@ -21,7 +21,6 @@ function ampforwp_get_pb_comment_list($moduleFrontHtml, $moduleTemplate, $conten
21
  <h3><span>'.ampforwp_get_setting('amp-translator-view-comments-text').'</span></h3>
22
  <ul>';
23
  foreach ($comments as $key => $value) {
24
- if($value->user_id!=0){
25
  $avatar = get_avatar_url( $value->comment_author_email);
26
  $output .='<li>';
27
  if(ampforwp_get_setting('ampforwp-display-avatar')){
@@ -30,8 +29,7 @@ function ampforwp_get_pb_comment_list($moduleFrontHtml, $moduleTemplate, $conten
30
  $output .='<div class="pbc-auth-info"><div class="pbc-auth-name"><b class="fn">'.esc_attr($value->comment_author).'</b></div>';
31
  $output .='<span>'.esc_attr(date('F d, Y H:i:s', strtotime($value->comment_date))).'</span></div>';
32
  $output .='<p class="pbc-comment">'.wp_kses_post($value->comment_content).'</p>';
33
- $output .='</li>';
34
- }
35
  }
36
  $output .='</ul>';
37
  $output .='</div>';
21
  <h3><span>'.ampforwp_get_setting('amp-translator-view-comments-text').'</span></h3>
22
  <ul>';
23
  foreach ($comments as $key => $value) {
 
24
  $avatar = get_avatar_url( $value->comment_author_email);
25
  $output .='<li>';
26
  if(ampforwp_get_setting('ampforwp-display-avatar')){
29
  $output .='<div class="pbc-auth-info"><div class="pbc-auth-name"><b class="fn">'.esc_attr($value->comment_author).'</b></div>';
30
  $output .='<span>'.esc_attr(date('F d, Y H:i:s', strtotime($value->comment_date))).'</span></div>';
31
  $output .='<p class="pbc-comment">'.wp_kses_post($value->comment_content).'</p>';
32
+ $output .='</li>';
 
33
  }
34
  $output .='</ul>';
35
  $output .='</div>';
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.63
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -190,6 +190,30 @@ You can contact us from [here](https://ampforwp.com/contact/)
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
@@ -215,23 +239,4 @@ You can contact us from [here](https://ampforwp.com/contact/)
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
217
 
218
- = 1.0.62.1 (17th August 2020) =
219
- * Improvement: Removed unwanted javascript from AMP pages #4689
220
- * Fixed: Call to undefined function fifu_amp_url() #4688
221
- * Fixed: jQuery.fn.live() is deprecated warnings #4706
222
-
223
- = 1.0.62 (15th August 2020) =
224
- * Improvement: Added Yoast Local SEO plugin compatibility #4170
225
- * Improvement: Added option for changing the tags for the accordion module in AMP Page Builder #4208
226
- * Improvement: Added option for showing primary category of Yoast #4495
227
- * Improvement: Added condition for adding infinite scroll in AMP Woocommerce #4673
228
- * Improvement: Added excerpt option in in-content related posts #3981
229
- * Fixed: AMP not working on the Homepage with WP Ultimate recipe plugin #4538
230
- * Fixed: CSS overiding issue for the list and accourdion modules in AMP Page Builder #4674
231
- * Fixed: Alignment issue on homepage in design one #4676
232
- * Fixed: Debug Errors #4671
233
-
234
- = 1.0.61.2 (5th August 2020) =
235
- * Fixed: Removed Helpscout Beacon from Options Panel #4682
236
-
237
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.5
7
+ Stable tag: 1.0.64
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.64 (5th October 2020) =
194
+ * Fixed: Comments module of AMP pagebuilder is rendering only admin comments not the others #4745
195
+ * Fixed: Shortpixel is not generating WebP in AMP #4738
196
+ * Fixed: SEO option appearing in wordpress tool bar even No SEO plugin is active #4698
197
+ * Fixed: Auto add amp in menu url functionality is not working in tags #4734
198
+ * Fixed: The internal link for the the author page is generating in the AMP if the archive page support is disabled #4746
199
+ * Fixed: Scroll to top button not visible in Design 2 #4693
200
+ * Fixed: Notice: Undefined index: Cpage #4728
201
+ * Fixed: GDPR banner is off-centered, the 'X 'is out of the screen #4724
202
+ * Fixed: Wrong AMP html when the AMP takeover and ?amp is enabled #4731
203
+ * Fixed: Addon mode forcefully redirecting to reader mode not others #4742
204
+ * Fixed: Images not appearing with Image Photo Gallery Final Tiles Grid plugin #4675
205
+ * Fixed: In Design three, when click on the menu, the page gets pushed to the right side #4736
206
+ * Fixed: FAQ icon button is a too big in amp page. #4747
207
+ * Fixed: Added meta name="referrer" content="no-referrer-when-downgrade" #4715
208
+ * Fixed: In admin tool bar, (+) icon loading small and also author image invisible #4700
209
+ * Fixed: Issue with menu background when user add internal page navigation menu-items. #4630
210
+ * Fixed: Anchor tag getting stripped when Site Kit by Google is active. #4699
211
+ * Fixed: Merriweather font option in Design 1 does not work. #4726
212
+ * Fixed: If the user is adding the HTML code in the background video module then code is showing as output #4755
213
+ * Fixed: AMP 404 template is applying on non amp page #4723
214
+ * Fixed: In-Content Related Post appearing inside the blockquote when "After 50% of content" option is selected #4743
215
+ * Fixed: If the sticky ads is active then the sticky social share link tab is hiding behind the ads #4749
216
+
217
  = 1.0.63 (26th September 2020) =
218
  * Improvement: Added Reddit embeds support #4406
219
  * Improvement: Added multi select for post type in loop field #4365
239
  * Fixed: Gutenberg gallery block caption appearing at the end of the content #4716
240
  * Fixed: Validation error - accordion section must have 2 child tags #4208
241
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
242
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
templates/design-manager/design-1/footer.php CHANGED
@@ -50,8 +50,7 @@ wp_reset_postdata(); ?>
50
  echo strip_tags( ampforwp_translation($redux_builder_amp['amp-translator-footer-text'], 'All Rights Reserved') ,$allowed_tags );
51
  ?></p>
52
  <?php
53
- if ( true == ampforwp_get_setting('ampforwp-footer-top') || true == ampforwp_get_setting('amp-footer-link-non-amp-page') ) { ?><p class="rightslink back-to-top"><?php
54
- amp_back_to_top_link();
55
  if(true == ampforwp_get_setting('amp-footer-link-non-amp-page')){
56
  ampforwp_view_nonamp();
57
  }
50
  echo strip_tags( ampforwp_translation($redux_builder_amp['amp-translator-footer-text'], 'All Rights Reserved') ,$allowed_tags );
51
  ?></p>
52
  <?php
53
+ if ( true == ampforwp_get_setting('amp-footer-link-non-amp-page') ) { ?><p class="rightslink back-to-top"><?php
 
54
  if(true == ampforwp_get_setting('amp-footer-link-non-amp-page')){
55
  ampforwp_view_nonamp();
56
  }
templates/design-manager/design-1/style.php CHANGED
@@ -130,7 +130,11 @@ body, .cmts_list ul li{
130
  color: <?php echo sanitize_hex_color( $text_color ); ?>;
131
  font-weight: 300;
132
  line-height: 1.75em;
133
- <?php $fontFamily = "font-family: 'Arial', 'Helvetica', 'sans-serif'"; ?>
 
 
 
 
134
  <?php if( 1 == ampforwp_get_setting('ampforwp-google-font-switch') ) {
135
  $fontFamily = "font-family: 'Merriweather', 'Times New Roman', 'Times, Serif';";
136
  if(ampforwp_get_setting('amp_font_selector') != 1 && !empty(ampforwp_get_setting('amp_font_selector') )){
130
  color: <?php echo sanitize_hex_color( $text_color ); ?>;
131
  font-weight: 300;
132
  line-height: 1.75em;
133
+ <?php $fontFamily = "font-family: 'Arial', 'Helvetica', 'sans-serif'";
134
+ if( 1 == ampforwp_get_setting('ampforwp-d1-font') ) {
135
+ $fontFamily = "font-family: 'Merriweather','Times New Roman', 'Times'";
136
+ }
137
+ ?>
138
  <?php if( 1 == ampforwp_get_setting('ampforwp-google-font-switch') ) {
139
  $fontFamily = "font-family: 'Merriweather', 'Times New Roman', 'Times, Serif';";
140
  if(ampforwp_get_setting('amp_font_selector') != 1 && !empty(ampforwp_get_setting('amp_font_selector') )){
templates/design-manager/design-2/footer.php CHANGED
@@ -43,16 +43,13 @@ global $redux_builder_amp;
43
  </nav>
44
  </div>
45
  <?php } ?>
46
- <p class="rightslink back-to-top"><?php
47
- if ( true == ampforwp_get_setting('ampforwp-footer-top') || true == ampforwp_get_setting('amp-footer-link-non-amp-page') ) {
48
- amp_back_to_top_link();
49
  if(true == ampforwp_get_setting('amp-footer-link-non-amp-page')){
50
  ampforwp_view_nonamp();
51
- }
52
- };
53
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
54
  echo strip_tags( ampforwp_translation($redux_builder_amp['amp-translator-footer-text'], 'All Rights Reserved') ,$allowed_tags );
55
- ?></p>
56
  <?php do_action('amp_footer_link'); ?>
57
  </div>
58
  </footer>
43
  </nav>
44
  </div>
45
  <?php } ?>
46
+ <?php
 
 
47
  if(true == ampforwp_get_setting('amp-footer-link-non-amp-page')){
48
  ampforwp_view_nonamp();
49
+ }
 
50
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
51
  echo strip_tags( ampforwp_translation($redux_builder_amp['amp-translator-footer-text'], 'All Rights Reserved') ,$allowed_tags );
52
+ ?>
53
  <?php do_action('amp_footer_link'); ?>
54
  </div>
55
  </footer>
templates/design-manager/design-3/footer.php CHANGED
@@ -96,9 +96,7 @@ global $redux_builder_amp;
96
  <?php }?>
97
  </ul>
98
  </div>
99
- <?php }
100
- if(true == ampforwp_get_setting('ampforwp-footer-top')){?><p class="rightslink back-to-top"><?php amp_back_to_top_link();?></p><?php
101
- } ?>
102
  <p class="rightslink"><?php
103
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
104
  echo strip_tags( ampforwp_translation($redux_builder_amp['amp-translator-footer-text'], 'All Rights Reserved') ,$allowed_tags );
96
  <?php }?>
97
  </ul>
98
  </div>
99
+ <?php } ?>
 
 
100
  <p class="rightslink"><?php
101
  $allowed_tags = '<p><a><b><strong><i><u><ul><ol><li><h1><h2><h3><h4><h5><h6><table><tr><th><td><em><span>';
102
  echo strip_tags( ampforwp_translation($redux_builder_amp['amp-translator-footer-text'], 'All Rights Reserved') ,$allowed_tags );
templates/design-manager/design-3/style.php CHANGED
@@ -466,6 +466,7 @@ pre{ white-space: pre-wrap; }
466
  transform-origin: right center;*/
467
  }
468
  /* Sidebar */
 
469
  #sidebar[open]+#designthree { max-height: 100vh; overflow: hidden;
470
  animation: opening .3s normal forwards ease-in-out 0s;
471
  <?php if (ampforwp_get_setting('header-overlay-position-d3') == 1 ) {?>
@@ -475,6 +476,7 @@ pre{ white-space: pre-wrap; }
475
  transform: translate3d(-60%, 0, 0) scale(0.8);
476
  <?php } ?>
477
  }
 
478
  @keyframes opening{
479
  0% { transform: translate3d(0, 0, 0) scale(1); }
480
  100% {
466
  transform-origin: right center;*/
467
  }
468
  /* Sidebar */
469
+ @media screen and (max-width: 786px) {
470
  #sidebar[open]+#designthree { max-height: 100vh; overflow: hidden;
471
  animation: opening .3s normal forwards ease-in-out 0s;
472
  <?php if (ampforwp_get_setting('header-overlay-position-d3') == 1 ) {?>
476
  transform: translate3d(-60%, 0, 0) scale(0.8);
477
  <?php } ?>
478
  }
479
+ }
480
  @keyframes opening{
481
  0% { transform: translate3d(0, 0, 0) scale(1); }
482
  100% {
templates/design-manager/swift/header.php CHANGED
@@ -19,7 +19,7 @@ if( !ampforwp_levelup_compatibility('hf_builder_head') ){
19
  do_action('ampforwp_reading_progress_bar'); ?>
20
  <header class="header h_m h_m_1">
21
  <?php do_action('ampforwp_header_top_design4'); ?>
22
- <input type="checkbox" id="offcanvas-menu" class="tg" />
23
  <div class="hamb-mnu">
24
  <aside class="m-ctr">
25
  <div class="m-scrl">
@@ -154,7 +154,7 @@ if( !ampforwp_levelup_compatibility('hf_builder_head') ){
154
  do_action('ampforwp_reading_progress_bar'); ?>
155
  <header class="header-2 h_m h_m_1">
156
  <?php do_action('ampforwp_header_top_design4'); ?>
157
- <input type="checkbox" id="offcanvas-menu" class="tg" />
158
  <div class="hamb-mnu">
159
  <aside class="m-ctr">
160
  <div class="m-scrl">
@@ -286,7 +286,7 @@ if( !ampforwp_levelup_compatibility('hf_builder_head') ){
286
  do_action('ampforwp_reading_progress_bar'); ?>
287
  <header class="header-3 h_m h_m_1">
288
  <?php do_action('ampforwp_header_top_design4'); ?>
289
- <input type="checkbox" id="offcanvas-menu" class="tg" />
290
  <div class="hamb-mnu">
291
  <aside class="m-ctr">
292
  <div class="m-scrl">
19
  do_action('ampforwp_reading_progress_bar'); ?>
20
  <header class="header h_m h_m_1">
21
  <?php do_action('ampforwp_header_top_design4'); ?>
22
+ <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
23
  <div class="hamb-mnu">
24
  <aside class="m-ctr">
25
  <div class="m-scrl">
154
  do_action('ampforwp_reading_progress_bar'); ?>
155
  <header class="header-2 h_m h_m_1">
156
  <?php do_action('ampforwp_header_top_design4'); ?>
157
+ <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
158
  <div class="hamb-mnu">
159
  <aside class="m-ctr">
160
  <div class="m-scrl">
286
  do_action('ampforwp_reading_progress_bar'); ?>
287
  <header class="header-3 h_m h_m_1">
288
  <?php do_action('ampforwp_header_top_design4'); ?>
289
+ <input type="checkbox" id="offcanvas-menu" on="change:AMP.setState({ offcanvas_menu: (event.checked ? true : false) })" [checked] = "offcanvas_menu" class="tg" />
290
  <div class="hamb-mnu">
291
  <aside class="m-ctr">
292
  <div class="m-scrl">
templates/design-manager/swift/style.php CHANGED
@@ -1966,7 +1966,7 @@ if ( $ampforwp_font_icon == 'fontawesome-icons' ){ ?>
1966
  padding-bottom:40px;
1967
  }
1968
  .s_stk{
1969
- z-index:99;
1970
  }
1971
  .body.single-post .adsforwp-stick-ad, .body.single-post amp-sticky-ad{
1972
  padding-bottom:45px;
1966
  padding-bottom:40px;
1967
  }
1968
  .s_stk{
1969
+ z-index:99999999;
1970
  }
1971
  .body.single-post .adsforwp-stick-ad, .body.single-post amp-sticky-ad{
1972
  padding-bottom:45px;
templates/features.php CHANGED
@@ -285,7 +285,15 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
285
  if ( is_home() && ! ampforwp_is_blog() && !ampforwp_get_setting('ampforwp-homepage-on-off-support') ) {
286
  return;
287
  }
288
-
 
 
 
 
 
 
 
 
289
  $page_for_posts = intval(get_option( 'page_for_posts' ));
290
  $post_id = ampforwp_get_the_ID();
291
  if ( ampforwp_is_blog() && ! ampforwp_get_setting('amp-on-off-for-all-pages') && ($page_for_posts != $post_id ) ) {
@@ -371,7 +379,9 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
371
  $amp_url = untrailingslashit($current_search_url);
372
  }
373
  // URL Purifier
374
- $amp_url = ampforwp_url_purifier($amp_url);
 
 
375
  if(true == ampforwp_get_setting('amp-core-end-point') && (!is_home() && !is_front_page() && !is_archive())){
376
  $amp_url = add_query_arg( 'amp', '', get_the_permalink() );
377
  }
@@ -406,7 +416,10 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
406
  }
407
  if (is_preview()) {
408
  $amp_url = preg_replace('/(.*?)&(.*?)/', '$1&amp&$2', $amp_url);
409
- }
 
 
 
410
  return esc_url_raw($amp_url);
411
  }
412
  }
@@ -2357,7 +2370,9 @@ function ampforwp_editable_archvies_title($title) {
2357
  //39. #560 Header and Footer Editable html enabled script area
2358
  add_action('amp_post_template_footer','ampforwp_footer_html_output',11);
2359
  function ampforwp_footer_html_output() {
2360
-
 
 
2361
  if( ampforwp_get_setting('amp-footer-text-area-for-html') ) {
2362
  echo ampforwp_get_setting('amp-footer-text-area-for-html') ;
2363
  }
@@ -3503,6 +3518,10 @@ function ampforwp_add_meta_viewport() {
3503
  $output = '<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,user-scalable=yes">';
3504
  }
3505
  }
 
 
 
 
3506
  echo apply_filters('ampforwp_modify_meta_viewport_filter',$output);
3507
 
3508
  }
@@ -4973,8 +4992,9 @@ function ampforwp_generate_inline_related_posts($content){
4973
  $content_parts = explode($break_point, $content);
4974
  array_walk($content_parts, function(&$value, $key) {
4975
  $value = trim($value);
4976
- if( !empty($value) && strpos($value, "<p>")!==false ){
4977
  $value .= '</p>';
 
4978
  }
4979
  }
4980
  );
@@ -5969,6 +5989,10 @@ function ampforwp_is_non_amp( $type="" ) {
5969
  if ( is_search() && ( (4 == ampforwp_get_setting('amp-design-selector') && false == ampforwp_get_setting('amp-swift-search-feature') ) ) ){
5970
  return false;
5971
  }
 
 
 
 
5972
  // Enabling AMP Takeover only when selected in Custom Post Type
5973
  $supported_types_for_takeover = array();
5974
  $supported_types_for_takeover = ampforwp_get_all_post_types();
@@ -5991,6 +6015,9 @@ function ampforwp_is_non_amp( $type="" ) {
5991
  if(get_query_var( 'robots' )){
5992
  return;
5993
  }
 
 
 
5994
  }elseif( (
5995
  ampforwp_get_setting('amp-design-selector') == 4)
5996
  &&
@@ -7748,10 +7775,12 @@ function ampforwp_head_css(){
7748
  'id' => 'user-info',
7749
  'title' => $title
7750
  ) );
7751
- $wp_admin_bar->add_menu( array(
7752
- 'id' => 'wpseo-menu',
7753
- 'title' => "SEO"
7754
- ) );
 
 
7755
  $wp_admin_bar->remove_menu( 'ampforwp-view-amp' );
7756
  if(function_exists('autoptimize_autoload')){
7757
  $wp_admin_bar->remove_menu( 'autoptimize' );
@@ -7990,7 +8019,7 @@ if ( ! function_exists('ampforwp_font_url') ) {
7990
  }
7991
  }
7992
  //Need to add full short pixel plugin compatibility #3782
7993
- if(function_exists('shortPixelDebugErrorHandler')){
7994
  add_filter( 'ampforwp_the_content_last_filter','ampforwp_short_pixel_cdn');
7995
  }
7996
  function ampforwp_short_pixel_cdn($content){
285
  if ( is_home() && ! ampforwp_is_blog() && !ampforwp_get_setting('ampforwp-homepage-on-off-support') ) {
286
  return;
287
  }
288
+ if (!ampforwp_is_home() && !ampforwp_is_front_page() && !is_category() && !is_tag() && !is_singular( array('page', 'attachment', 'post'))){
289
+ global $post_type;
290
+ if (empty(ampforwp_get_setting('ampforwp-custom-type'))) {
291
+ return;
292
+ }
293
+ if(is_array(ampforwp_get_setting('ampforwp-custom-type')) && $post_type != ampforwp_get_setting('ampforwp-custom-type')[0]){
294
+ return;
295
+ }
296
+ }
297
  $page_for_posts = intval(get_option( 'page_for_posts' ));
298
  $post_id = ampforwp_get_the_ID();
299
  if ( ampforwp_is_blog() && ! ampforwp_get_setting('amp-on-off-for-all-pages') && ($page_for_posts != $post_id ) ) {
379
  $amp_url = untrailingslashit($current_search_url);
380
  }
381
  // URL Purifier
382
+ if(!ampforwp_get_setting('amp-core-end-point') && !ampforwp_get_setting('ampforwp-amp-takeover')){
383
+ $amp_url = ampforwp_url_purifier($amp_url);
384
+ }
385
  if(true == ampforwp_get_setting('amp-core-end-point') && (!is_home() && !is_front_page() && !is_archive())){
386
  $amp_url = add_query_arg( 'amp', '', get_the_permalink() );
387
  }
416
  }
417
  if (is_preview()) {
418
  $amp_url = preg_replace('/(.*?)&(.*?)/', '$1&amp&$2', $amp_url);
419
+ }
420
+ if(ampforwp_get_setting('amp-core-end-point') && ampforwp_get_setting('ampforwp-amp-takeover') && is_singular()){
421
+ $amp_url = get_the_permalink();
422
+ }
423
  return esc_url_raw($amp_url);
424
  }
425
  }
2370
  //39. #560 Header and Footer Editable html enabled script area
2371
  add_action('amp_post_template_footer','ampforwp_footer_html_output',11);
2372
  function ampforwp_footer_html_output() {
2373
+ if(true == ampforwp_get_setting('ampforwp-footer-top')){
2374
+ amp_back_to_top_link();
2375
+ }
2376
  if( ampforwp_get_setting('amp-footer-text-area-for-html') ) {
2377
  echo ampforwp_get_setting('amp-footer-text-area-for-html') ;
2378
  }
3518
  $output = '<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,user-scalable=yes">';
3519
  }
3520
  }
3521
+ global $is_safari;
3522
+ if ($is_safari) {
3523
+ $output .= '<meta name="referrer" content="no-referrer-when-downgrade">';
3524
+ }
3525
  echo apply_filters('ampforwp_modify_meta_viewport_filter',$output);
3526
 
3527
  }
4992
  $content_parts = explode($break_point, $content);
4993
  array_walk($content_parts, function(&$value, $key) {
4994
  $value = trim($value);
4995
+ if( !empty($value) && (strpos($value, "<p>")!==false || strpos($value, "<blockquote>")!==false)){
4996
  $value .= '</p>';
4997
+ $value .= '</blockquote>';
4998
  }
4999
  }
5000
  );
5989
  if ( is_search() && ( (4 == ampforwp_get_setting('amp-design-selector') && false == ampforwp_get_setting('amp-swift-search-feature') ) ) ){
5990
  return false;
5991
  }
5992
+ //Removed AMP Takeover when custom 404 Page is selected in enfold theme #4723
5993
+ if ( function_exists('avia_preload_screen') && !empty(avia_get_option('error404_page')) && is_404() ) {
5994
+ return false;
5995
+ }
5996
  // Enabling AMP Takeover only when selected in Custom Post Type
5997
  $supported_types_for_takeover = array();
5998
  $supported_types_for_takeover = ampforwp_get_all_post_types();
6015
  if(get_query_var( 'robots' )){
6016
  return;
6017
  }
6018
+ if(is_search() && 0 == ampforwp_get_setting('amp-redirection-search')){
6019
+ return false;
6020
+ }
6021
  }elseif( (
6022
  ampforwp_get_setting('amp-design-selector') == 4)
6023
  &&
7775
  'id' => 'user-info',
7776
  'title' => $title
7777
  ) );
7778
+ if(class_exists('WPSEO_Options')){
7779
+ $wp_admin_bar->add_menu( array(
7780
+ 'id' => 'wpseo-menu',
7781
+ 'title' => "SEO"
7782
+ ) );
7783
+ }
7784
  $wp_admin_bar->remove_menu( 'ampforwp-view-amp' );
7785
  if(function_exists('autoptimize_autoload')){
7786
  $wp_admin_bar->remove_menu( 'autoptimize' );
8019
  }
8020
  }
8021
  //Need to add full short pixel plugin compatibility #3782
8022
+ if(class_exists('ShortPixelAPI')){
8023
  add_filter( 'ampforwp_the_content_last_filter','ampforwp_short_pixel_cdn');
8024
  }
8025
  function ampforwp_short_pixel_cdn($content){
templates/template-mode/admin-bar.css CHANGED
@@ -1 +1 @@
1
- #wpadminbar,#wpadminbar *{font-size:13px;font-weight:400;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;line-height:32px}#wpadminbar *{height:auto;width:auto;margin:0;padding:0;text-shadow:none;text-transform:none;letter-spacing:normal;border-radius:0;box-sizing:content-box;transition:none;-webkit-font-smoothing:subpixel-antialiased;-moz-osx-font-smoothing:auto}#wpadminbar .ab-empty-item{cursor:default;outline:0}#wpadminbar .ab-empty-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label{color:#eee}#wpadminbar #wp-admin-bar-site-name a.ab-item{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}#wpadminbar ul li:after,#wpadminbar ul li:before{content:normal}#wpadminbar a,#wpadminbar a:hover{outline:0;border:0;text-decoration:none;background:0}#wpadminbar a:active,#wpadminbar a:focus,#wpadminbar div{box-shadow:none;outline:0}#wpadminbar{direction:ltr;color:#ccc;height:32px;position:fixed;top:0;left:0;width:100%;min-width:600px;z-index:99999;background:#23282d}#wpadminbar .ab-sub-wrapper,#wpadminbar ul,#wpadminbar ul li{background:0;clear:none;list-style:none;margin:0;padding:0;position:relative;text-indent:0;z-index:99999}#wpadminbar ul#wp-admin-bar-root-default>li{margin-right:0}#wpadminbar .quicklinks ul{text-align:left}#wpadminbar li{float:left}#wpadminbar .quicklinks .ab-top-secondary>li{float:right}#wpadminbar .quicklinks .ab-empty-item,#wpadminbar .quicklinks a{height:32px;display:block;padding:0 10px;margin:0}#wpadminbar .quicklinks>ul>li>a{padding:0 8px 0 7px}#wpadminbar .menupop .ab-sub-wrapper{margin:0;padding:0;box-shadow:0 3px 5px rgba(0,0,0,.2);background:#32373c;display:none;position:absolute;float:none}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper{min-width:100%}#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper{right:0;left:auto}#wpadminbar .ab-submenu{padding:6px 0}#wpadminbar .quicklinks .menupop ul li{float:none}#wpadminbar .quicklinks .menupop ul li .ab-item,#wpadminbar .quicklinks .menupop:focus-within ul li .ab-item,#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item{line-height:26px;height:26px;white-space:nowrap;min-width:140px}#wpadminbar li:focus-within>.ab-sub-wrapper,#wpadminbar.nojs li:hover>.ab-sub-wrapper{display:block}#wpadminbar .menupop li:focus-within>.ab-sub-wrapper,#wpadminbar .menupop li:hover>.ab-sub-wrapper{margin-left:100%;margin-top:-32px}#wpadminbar .ab-top-menu>li:focus-within>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{background:#32373c;color:#00b9eb}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label,#wpadminbar>#wp-toolbar li:focus-within span.ab-label{color:#00b9eb}#wpadminbar .ab-icon,#wpadminbar .ab-item:before,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default .ab-icon{position:relative;float:left;font:400 20px/1 dashicons;speak:none;padding:4px 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-image:none;margin-right:6px}#wpadminbar .ab-icon:before,#wpadminbar .ab-item:before{color:#a0a5aa;color:rgba(240,245,250,.6);position:relative;transition:all .1s ease-in-out}#wpadminbar .ab-label{display:inline-block;height:32px}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop:focus-within ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#b4b9be;color:rgba(240,245,250,.7)}#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop:focus-within ul li a:focus,#wpadminbar .quicklinks .menupop:focus-within ul li a:hover,#wpadminbar .quicklinks .menupop:focus-within ul li div[tabindex]:focus,#wpadminbar .quicklinks .menupop:focus-within ul li div[tabindex]:hover,#wpadminbar li .ab-item:focus .ab-icon:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li:focus-within .ab-icon:before,#wpadminbar li:focus-within .ab-item:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#00b9eb}#wpadminbar .menupop .menupop>.ab-item:before{position:absolute;font:400 17px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;top:1px;right:4px;content:"\f139";color:inherit}#wpadminbar .menupop .menupop>.ab-item{display:block;padding-right:2em}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{display:block;position:relative;right:auto;margin:0;box-shadow:none;background:#464b50}#wpadminbar .quicklinks .menupop .ab-sub-secondary>li>a:hover{color:#00b9eb}#wpadminbar .ab-top-secondary{float:right}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child .ab-item{box-shadow:none}#wp-admin-bar-my-account>.ab-item:before{content:"\f110";top:2px;float:right;margin-left:6px;margin-right:0}#wp-admin-bar-my-account.with-avatar>.ab-item:before{display:none;content:none}#wpadminbar #wp-admin-bar-user-actions>li{margin-left:16px;margin-right:16px}#wpadminbar #wp-admin-bar-user-actions.ab-submenu{padding:6px 0 12px}#wpadminbar #wp-admin-bar-my-account.with-avatar #wp-admin-bar-user-actions>li{margin-left:88px}#wpadminbar #wp-admin-bar-user-info{margin-top:6px;margin-bottom:15px;height:auto;background:0}#wpadminbar #wp-admin-bar-user-info a{background:0;height:auto}#wpadminbar #wp-admin-bar-user-info span{background:0;padding:0;height:18px}#wpadminbar #wp-admin-bar-user-info .display-name{display:block}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon{width:15px;height:20px;margin-right:0;padding:6px 0 5px}#wpadminbar #wp-admin-bar-wp-logo>.ab-item{padding:0 7px}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon:before{content:"\f120";top:2px}#wpadminbar #wp-admin-bar-appearance{margin-top:-12px}#wpadminbar #wp-admin-bar-customize>.ab-item:before{content:"\f540";top:2px}#wpadminbar #wp-admin-bar-edit>.ab-item:before{content:"\f464";top:2px}#wpadminbar #wp-admin-bar-site-name>.ab-item:before{top:2px;content:"\f226"}#wpadminbar #wp-admin-bar-comments .ab-icon{margin-right:6px}#wpadminbar #wp-admin-bar-comments .ab-icon:before{content:"\f101";top:3px}#wpadminbar #wp-admin-bar-comments .count-0{opacity:.5}#wpadminbar #wp-admin-bar-new-content .ab-icon:before{content:"\f132";top:4px}#wpadminbar #wp-admin-bar-updates .ab-icon:before{content:"\f463";top:2px}#wpadminbar .screen-reader-text{border:0;clip:rect(1px,1px,1px,1px);-webkit-clip-path:inset(50%);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;word-wrap:normal}#wpadminbar .screen-reader-shortcut{position:absolute;top:-1000em}#wpadminbar .screen-reader-shortcut:focus{left:6px;top:7px;height:auto;width:auto;display:block;font-size:14px;font-weight:600;padding:15px 23px 14px;background:#f1f1f1;color:#0073aa;z-index:100000;line-height:normal;text-decoration:none;box-shadow:0 0 2px 2px rgba(0,0,0,.6)}@media screen and (max-width:782px){html #wpadminbar{height:46px;min-width:300px}#wpadminbar *{font-size:14px;font-weight:400;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;line-height:32px}#wpadminbar .quicklinks .ab-empty-item,#wpadminbar .quicklinks>ul>li>a{padding:0;height:46px;line-height:46px;width:auto}#wpadminbar .ab-icon{font:40px/1 dashicons;margin:0;width:52px;height:46px;text-align:center}#wpadminbar .ab-icon:before{text-align:center}#wpadminbar .ab-submenu{padding:0}#wpadminbar #wp-admin-bar-my-account a.ab-item,#wpadminbar #wp-admin-bar-site-name a.ab-item{text-overflow:clip}#wpadminbar .ab-label{display:none}#wpadminbar .menupop li:focus-within>.ab-sub-wrapper,#wpadminbar .menupop li:hover>.ab-sub-wrapper{margin-top:-46px}#wpadminbar #wp-admin-bar-comments .ab-icon,#wpadminbar #wp-admin-bar-my-account.with-avatar #wp-admin-bar-user-actions>li{margin:0}#wpadminbar .ab-top-menu .menupop .ab-sub-wrapper .menupop>.ab-item{padding-right:30px}#wpadminbar .menupop .menupop>.ab-item:before{top:10px;right:6px}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper .ab-item{font-size:16px;padding:8px 16px}#wpadminbar #wp-admin-bar-wp-logo>.ab-item{padding:0}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon{padding:0;width:52px;height:46px;text-align:center;vertical-align:top}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon:before{font:28px/1 dashicons;top:-3px}#wpadminbar .ab-icon,#wpadminbar .ab-item:before{padding:0}#wpadminbar #wp-admin-bar-customize>.ab-item,#wpadminbar #wp-admin-bar-edit>.ab-item,#wpadminbar #wp-admin-bar-my-account>.ab-item,#wpadminbar #wp-admin-bar-site-name>.ab-item{text-indent:100%;white-space:nowrap;overflow:hidden;width:52px;padding:0;color:#a0a5aa;position:relative}#wpadminbar .ab-icon,#wpadminbar .ab-item:before,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default .ab-icon{padding:0;margin-right:0}#wpadminbar #wp-admin-bar-customize>.ab-item:before,#wpadminbar #wp-admin-bar-edit>.ab-item:before,#wpadminbar #wp-admin-bar-my-account>.ab-item:before,#wpadminbar #wp-admin-bar-site-name>.ab-item:before{display:block;text-indent:0;font:400 32px/1 dashicons;speak:none;top:7px;width:52px;text-align:center;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#wpadminbar #wp-admin-bar-appearance{margin-top:0}#wpadminbar #wp-admin-bar-new-content .ab-icon:before{top:0;line-height:53px;height:46px;text-align:center;width:52px;display:block}#wpadminbar #wp-admin-bar-updates{text-align:center}#wpadminbar #wp-admin-bar-updates .ab-icon:before{top:3px}#wpadminbar #wp-admin-bar-comments .ab-icon:before{display:block;font-size:34px;height:46px;line-height:47px;top:0}#wpadminbar #wp-admin-bar-my-account>a{position:relative;white-space:nowrap;text-indent:150%;width:28px;padding:0 10px;overflow:hidden}#wpadminbar #wp-admin-bar-user-actions.ab-submenu{padding:0}#wpadminbar #wp-admin-bar-user-info .display-name{height:auto;font-size:16px;line-height:24px;color:#eee}#wpadminbar #wp-admin-bar-user-info a{padding-top:4px}#wp-toolbar>ul>li{display:none}#wpadminbar li#wp-admin-bar-comments,#wpadminbar li#wp-admin-bar-customize,#wpadminbar li#wp-admin-bar-edit,#wpadminbar li#wp-admin-bar-my-account,#wpadminbar li#wp-admin-bar-new-content,#wpadminbar li#wp-admin-bar-site-name,#wpadminbar li#wp-admin-bar-updates,#wpadminbar li#wp-admin-bar-wp-logo{display:block}#wpadminbar li:focus-within ul li,#wpadminbar li:hover ul li,#wpadminbar li:hover ul li:hover ul li{display:list-item}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper{min-width:-webkit-fit-content;min-width:-moz-fit-content;min-width:fit-content}#wpadminbar ul#wp-admin-bar-root-default>li{margin-right:0}#wpadminbar #wp-admin-bar-comments,#wpadminbar #wp-admin-bar-edit,#wpadminbar #wp-admin-bar-my-account,#wpadminbar #wp-admin-bar-new-content,#wpadminbar #wp-admin-bar-site-name,#wpadminbar #wp-admin-bar-updates,#wpadminbar #wp-admin-bar-wp-logo,#wpadminbar .ab-top-menu,#wpadminbar .ab-top-secondary{position:static}#wpadminbar #wp-admin-bar-my-account{float:right}}@media screen and (max-width:600px){#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar li#wp-admin-bar-updates,#wpadminbar li#wp-admin-bar-wp-logo{display:none}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper{width:100%;left:0}#wpadminbar #wp-admin-bar-wp-logo.menupop .ab-sub-wrapper{margin-left:0}#wpadminbar .ab-top-menu>.menupop li>.ab-sub-wrapper{margin:0;width:100%;top:auto;left:auto;position:static;box-shadow:none}#wpadminbar .ab-top-menu>.menupop li>.ab-sub-wrapper .ab-item{font-size:16px;padding:6px 15px 19px 30px}#wpadminbar li:hover ul li ul li{display:list-item}}@media screen and (max-width:400px){#wpadminbar li#wp-admin-bar-comments{display:none}}
1
+ #wpadminbar,#wpadminbar *{font-size:13px;font-weight:400;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;line-height:32px}#wpadminbar *{height:auto;width:auto;margin:0;padding:0;text-shadow:none;text-transform:none;letter-spacing:normal;border-radius:0;box-sizing:content-box;transition:none;-webkit-font-smoothing:subpixel-antialiased;-moz-osx-font-smoothing:auto}#wpadminbar .ab-empty-item{cursor:default;outline:0}#wpadminbar .ab-empty-item,#wpadminbar a.ab-item,#wpadminbar>#wp-toolbar span.ab-label{color:#eee}#wpadminbar #wp-admin-bar-site-name a.ab-item{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}#wpadminbar ul li:after,#wpadminbar ul li:before{content:normal}#wpadminbar a,#wpadminbar a:hover{outline:0;border:0;text-decoration:none;background:0}#wpadminbar a:active,#wpadminbar a:focus,#wpadminbar div{box-shadow:none;outline:0}#wpadminbar{direction:ltr;color:#ccc;height:32px;position:fixed;top:0;left:0;width:100%;min-width:600px;z-index:99999;background:#23282d}#wpadminbar .ab-sub-wrapper,#wpadminbar ul,#wpadminbar ul li{background:0;clear:none;list-style:none;margin:0;padding:0;position:relative;text-indent:0;z-index:99999}#wpadminbar ul#wp-admin-bar-root-default>li{margin-right:0}#wpadminbar .quicklinks ul{text-align:left}#wpadminbar li{float:left}#wpadminbar .quicklinks .ab-top-secondary>li{float:right}#wpadminbar .quicklinks .ab-empty-item,#wpadminbar .quicklinks a{height:32px;display:block;padding:0 10px;margin:0}#wpadminbar .quicklinks>ul>li>a{padding:0 8px 0 7px}#wpadminbar .menupop .ab-sub-wrapper{margin:0;padding:0;box-shadow:0 3px 5px rgba(0,0,0,.2);background:#32373c;display:none;position:absolute;float:none}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper{min-width:100%}#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper{right:0;left:auto}#wpadminbar .ab-submenu{padding:6px 0}#wpadminbar .quicklinks .menupop ul li{float:none}#wpadminbar .quicklinks .menupop ul li .ab-item,#wpadminbar .quicklinks .menupop:focus-within ul li .ab-item,#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item{line-height:26px;height:26px;white-space:nowrap;min-width:140px}#wpadminbar li:focus-within>.ab-sub-wrapper,#wpadminbar.nojs li:hover>.ab-sub-wrapper{display:block}#wpadminbar .menupop li:focus-within>.ab-sub-wrapper,#wpadminbar .menupop li:hover>.ab-sub-wrapper{margin-left:100%;margin-top:-32px}#wpadminbar .ab-top-menu>li:focus-within>.ab-item,#wpadminbar.nojq .quicklinks .ab-top-menu>li>.ab-item:focus,#wpadminbar:not(.mobile) .ab-top-menu>li:hover>.ab-item,#wpadminbar:not(.mobile) .ab-top-menu>li>.ab-item:focus{background:#32373c;color:#00b9eb}#wpadminbar:not(.mobile)>#wp-toolbar a:focus span.ab-label,#wpadminbar:not(.mobile)>#wp-toolbar li:hover span.ab-label,#wpadminbar>#wp-toolbar li:focus-within span.ab-label{color:#00b9eb}#wpadminbar .ab-icon,#wpadminbar .ab-item:before,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default .ab-icon{position:relative;float:left;font:400 20px/1 dashicons;speak:none;padding:4px 0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-image:none;margin-right:6px}#wpadminbar .ab-icon:before,#wpadminbar .ab-item:before{color:#a0a5aa;color:rgba(240,245,250,.6);position:relative;transition:all .1s ease-in-out}#wpadminbar .ab-label{display:inline-block;height:32px}#wpadminbar .ab-submenu .ab-item,#wpadminbar .quicklinks .menupop ul li a,#wpadminbar .quicklinks .menupop:focus-within ul li a,#wpadminbar.nojs .quicklinks .menupop:hover ul li a{color:#b4b9be;color:rgba(240,245,250,.7)}#wpadminbar .quicklinks .menupop ul li a:focus,#wpadminbar .quicklinks .menupop ul li a:hover,#wpadminbar .quicklinks .menupop:focus-within ul li a:focus,#wpadminbar .quicklinks .menupop:focus-within ul li a:hover,#wpadminbar .quicklinks .menupop:focus-within ul li div[tabindex]:focus,#wpadminbar .quicklinks .menupop:focus-within ul li div[tabindex]:hover,#wpadminbar li .ab-item:focus .ab-icon:before,#wpadminbar li .ab-item:focus:before,#wpadminbar li a:focus .ab-icon:before,#wpadminbar li:focus-within .ab-icon:before,#wpadminbar li:focus-within .ab-item:before,#wpadminbar li:hover .ab-icon:before,#wpadminbar li:hover .ab-item:before,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover{color:#00b9eb}#wpadminbar .menupop .menupop>.ab-item:before{position:absolute;font:400 17px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;top:1px;right:4px;content:"\f139";color:inherit}#wpadminbar .menupop .menupop>.ab-item{display:block;padding-right:2em}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{display:block;position:relative;right:auto;margin:0;box-shadow:none;background:#464b50}#wpadminbar .quicklinks .menupop .ab-sub-secondary>li>a:hover{color:#00b9eb}#wpadminbar .ab-top-secondary{float:right}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child .ab-item{box-shadow:none}#wp-admin-bar-my-account>.ab-item:before{content:"\f110";top:2px;float:right;margin-left:6px;margin-right:0}#wp-admin-bar-my-account.with-avatar>.ab-item:before{display:none;content:none}#wpadminbar #wp-admin-bar-user-actions>li{margin-left:16px;margin-right:16px}#wpadminbar #wp-admin-bar-user-actions.ab-submenu{padding:6px 0 12px}#wpadminbar #wp-admin-bar-my-account.with-avatar #wp-admin-bar-user-actions>li{margin-left:88px}#wpadminbar #wp-admin-bar-user-info{margin-top:6px;margin-bottom:15px;height:auto;background:0}#wpadminbar #wp-admin-bar-user-info a{background:0;height:auto}#wpadminbar #wp-admin-bar-user-info span{background:0;padding:0;height:18px}#wpadminbar #wp-admin-bar-user-info .display-name{display:block}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon{width:15px;height:20px;margin-right:0;padding:6px 0 5px}#wpadminbar #wp-admin-bar-wp-logo>.ab-item{padding:0 7px}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon:before{content:"\f120";top:2px}#wpadminbar #wp-admin-bar-appearance{margin-top:-12px}#wpadminbar #wp-admin-bar-customize>.ab-item:before{content:"\f540";top:2px}#wpadminbar #wp-admin-bar-edit>.ab-item:before{content:"\f464";top:2px}#wpadminbar #wp-admin-bar-site-name>.ab-item:before{top:2px;content:"\f226"}#wpadminbar #wp-admin-bar-comments .ab-icon{margin-right:6px}#wpadminbar #wp-admin-bar-comments .ab-icon:before{content:"\f101";top:3px}#wpadminbar #wp-admin-bar-comments .count-0{opacity:.5}#wpadminbar #wp-admin-bar-new-content .ab-icon:before{content:"\f132";top:4px}#wpadminbar #wp-admin-bar-updates .ab-icon:before{content:"\f463";top:2px}#wpadminbar .screen-reader-text{border:0;clip:rect(1px,1px,1px,1px);-webkit-clip-path:inset(50%);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;word-wrap:normal}#wpadminbar .screen-reader-shortcut{position:absolute;top:-1000em}#wpadminbar .screen-reader-shortcut:focus{left:6px;top:7px;height:auto;width:auto;display:block;font-size:14px;font-weight:600;padding:15px 23px 14px;background:#f1f1f1;color:#0073aa;z-index:100000;line-height:normal;text-decoration:none;box-shadow:0 0 2px 2px rgba(0,0,0,.6)}@media screen and (max-width:782px){html #wpadminbar{height:46px;min-width:300px}#wpadminbar *{font-size:14px;font-weight:400;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;line-height:32px}#wpadminbar .quicklinks .ab-empty-item,#wpadminbar .quicklinks>ul>li>a{padding:0;height:46px;line-height:46px;width:auto}#wpadminbar #wp-admin-bar-my-account .avatar{position: absolute;top: 2px;right: 10px;width: 26px;height: 26px;}#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default #wp-admin-bar-new-content .ab-icon{font:40px/1 dashicons;}#wpadminbar .ab-icon{font:40px/1 dashicons;margin:0;width:52px;height:46px;text-align:center}#wpadminbar .ab-icon:before{text-align:center}#wpadminbar .ab-submenu{padding:0}#wpadminbar #wp-admin-bar-my-account a.ab-item,#wpadminbar #wp-admin-bar-site-name a.ab-item{text-overflow:clip}#wpadminbar .ab-label{display:none}#wpadminbar .menupop li:focus-within>.ab-sub-wrapper,#wpadminbar .menupop li:hover>.ab-sub-wrapper{margin-top:-46px}#wpadminbar #wp-admin-bar-comments .ab-icon,#wpadminbar #wp-admin-bar-my-account.with-avatar #wp-admin-bar-user-actions>li{margin:0}#wpadminbar .ab-top-menu .menupop .ab-sub-wrapper .menupop>.ab-item{padding-right:30px}#wpadminbar .menupop .menupop>.ab-item:before{top:10px;right:6px}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper .ab-item{font-size:16px;padding:8px 16px}#wpadminbar #wp-admin-bar-wp-logo>.ab-item{padding:0}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon{padding:0;width:52px;height:46px;text-align:center;vertical-align:top}#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon:before{font:28px/1 dashicons;top:-3px}#wpadminbar .ab-icon,#wpadminbar .ab-item:before{padding:0}#wpadminbar #wp-admin-bar-customize>.ab-item,#wpadminbar #wp-admin-bar-edit>.ab-item,#wpadminbar #wp-admin-bar-my-account>.ab-item,#wpadminbar #wp-admin-bar-site-name>.ab-item{text-indent:100%;white-space:nowrap;overflow:hidden;width:52px;padding:0;color:#a0a5aa;position:relative}#wpadminbar .ab-icon,#wpadminbar .ab-item:before,#wpadminbar>#wp-toolbar>#wp-admin-bar-root-default .ab-icon{padding:0;margin-right:0}#wpadminbar #wp-admin-bar-customize>.ab-item:before,#wpadminbar #wp-admin-bar-edit>.ab-item:before,#wpadminbar #wp-admin-bar-my-account>.ab-item:before,#wpadminbar #wp-admin-bar-site-name>.ab-item:before{display:block;text-indent:0;font:400 32px/1 dashicons;speak:none;top:7px;width:52px;text-align:center;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#wpadminbar #wp-admin-bar-appearance{margin-top:0}#wpadminbar #wp-admin-bar-new-content .ab-icon:before{top:0;line-height:53px;height:46px;text-align:center;width:52px;display:block}#wpadminbar #wp-admin-bar-updates{text-align:center}#wpadminbar #wp-admin-bar-updates .ab-icon:before{top:3px}#wpadminbar #wp-admin-bar-comments .ab-icon:before{display:block;font-size:34px;height:46px;line-height:47px;top:0}#wpadminbar #wp-admin-bar-my-account>a{position:relative;white-space:nowrap;text-indent:150%;width:28px;padding:0 10px;overflow:hidden}#wpadminbar #wp-admin-bar-user-actions.ab-submenu{padding:0}#wpadminbar #wp-admin-bar-user-info .display-name{height:auto;font-size:16px;line-height:24px;color:#eee}#wpadminbar #wp-admin-bar-user-info a{padding-top:4px}#wp-toolbar>ul>li{display:none}#wpadminbar li#wp-admin-bar-comments,#wpadminbar li#wp-admin-bar-customize,#wpadminbar li#wp-admin-bar-edit,#wpadminbar li#wp-admin-bar-my-account,#wpadminbar li#wp-admin-bar-new-content,#wpadminbar li#wp-admin-bar-site-name,#wpadminbar li#wp-admin-bar-updates,#wpadminbar li#wp-admin-bar-wp-logo{display:block}#wpadminbar li:focus-within ul li,#wpadminbar li:hover ul li,#wpadminbar li:hover ul li:hover ul li{display:list-item}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper{min-width:-webkit-fit-content;min-width:-moz-fit-content;min-width:fit-content}#wpadminbar ul#wp-admin-bar-root-default>li{margin-right:0}#wpadminbar #wp-admin-bar-comments,#wpadminbar #wp-admin-bar-edit,#wpadminbar #wp-admin-bar-my-account,#wpadminbar #wp-admin-bar-new-content,#wpadminbar #wp-admin-bar-site-name,#wpadminbar #wp-admin-bar-updates,#wpadminbar #wp-admin-bar-wp-logo,#wpadminbar .ab-top-menu,#wpadminbar .ab-top-secondary{position:static}#wpadminbar #wp-admin-bar-my-account{float:right}}@media screen and (max-width:600px){#wpadminbar .menupop .menupop>.ab-item:before,#wpadminbar li#wp-admin-bar-updates,#wpadminbar li#wp-admin-bar-wp-logo{display:none}#wpadminbar .ab-top-menu>.menupop>.ab-sub-wrapper{width:100%;left:0}#wpadminbar #wp-admin-bar-wp-logo.menupop .ab-sub-wrapper{margin-left:0}#wpadminbar .ab-top-menu>.menupop li>.ab-sub-wrapper{margin:0;width:100%;top:auto;left:auto;position:static;box-shadow:none}#wpadminbar .ab-top-menu>.menupop li>.ab-sub-wrapper .ab-item{font-size:16px;padding:6px 15px 19px 30px}#wpadminbar li:hover ul li ul li{display:list-item}}@media screen and (max-width:400px){#wpadminbar li#wp-admin-bar-comments{display:none}}