AMP for WP – Accelerated Mobile Pages - Version 1.0.33

Version Description

(11th March 2020) = * Fixed: Categories not Hiding in Instant Articles #4254 * Fixed: Error when activating imagify plugin #4260 * Fixed: Start attribute not working in ol tags #4243 * Fixed: Search form not working in template mode #4227 #4224 * Fixed: Save button was disappearing when theme build on Redux framework #4259 * Fixed: SVG tag was removing in anchor tag #4252 * Fixed: Filter added to modify font face URL's #4258 * Fixed: Elementor CSS not loading on frontpage in ALL in One SEO #4253 * Fixed: Undefined variable: get_amp_custom_frontpage_id #4265 * Fixed: Images are not showing in AMP with Neva Child Theme #4261 * Fixed: AMP Option panel improvements #4245 #4269

Download this release

Release Info

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

Code changes from version 1.0.32 to 1.0.33

README.md CHANGED
@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3.2
7
- Stable tag: 1.0.32
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -194,6 +194,19 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
194
 
195
  == Changelog ==
196
 
 
 
 
 
 
 
 
 
 
 
 
 
 
197
  = 1.0.32 (6th March 2020) =
198
  * Fixed: Syntax breaking in advanced google analytics section #4228
199
  * Fixed: Optimize CSS (Tree shaking) not clearing on post update #4234
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3.2
7
+ Stable tag: 1.0.33
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
194
 
195
  == Changelog ==
196
 
197
+ = 1.0.33 (11th March 2020) =
198
+ * Fixed: Categories not Hiding in Instant Articles #4254
199
+ * Fixed: Error when activating imagify plugin #4260
200
+ * Fixed: Start attribute not working in ol tags #4243
201
+ * Fixed: Search form not working in template mode #4227 #4224
202
+ * Fixed: Save button was disappearing when theme build on Redux framework #4259
203
+ * Fixed: SVG tag was removing in anchor tag #4252
204
+ * Fixed: Filter added to modify font face URL's #4258
205
+ * Fixed: Elementor CSS not loading on frontpage in ALL in One SEO #4253
206
+ * Fixed: Undefined variable: get_amp_custom_frontpage_id #4265
207
+ * Fixed: Images are not showing in AMP with Neva Child Theme #4261
208
+ * Fixed: AMP Option panel improvements #4245 #4269
209
+
210
  = 1.0.32 (6th March 2020) =
211
  * Fixed: Syntax breaking in advanced google analytics section #4228
212
  * Fixed: Optimize CSS (Tree shaking) not clearing on post update #4234
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.32
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.32');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
+ Version: 1.0.33
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.33');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
changelog.txt CHANGED
@@ -1,5 +1,18 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 1.0.32 (6th March 2020) =
4
  * Fixed: Syntax breaking in advanced google analytics section #4228
5
  * Fixed: Optimize CSS (Tree shaking) not clearing on post update #4234
1
  == Changelog ==
2
 
3
+ = 1.0.33 (11th March 2020) =
4
+ * Fixed: Categories not Hiding in Instant Articles #4254
5
+ * Fixed: Error when activating imagify plugin #4260
6
+ * Fixed: Start attribute not working in ol tags #4243
7
+ * Fixed: Search form not working in template mode #4227 #4224
8
+ * Fixed: Save button was disappearing when theme build on Redux framework #4259
9
+ * Fixed: SVG tag was removing in anchor tag #4252
10
+ * Fixed: Filter added to modify font face URL's #4258
11
+ * Fixed: Elementor CSS not loading on frontpage in ALL in One SEO #4253
12
+ * Fixed: Undefined variable: get_amp_custom_frontpage_id #4265
13
+ * Fixed: Images are not showing in AMP with Neva Child Theme #4261
14
+ * Fixed: AMP Option panel improvements #4245 #4269
15
+
16
  = 1.0.32 (6th March 2020) =
17
  * Fixed: Syntax breaking in advanced google analytics section #4228
18
  * Fixed: Optimize CSS (Tree shaking) not clearing on post update #4234
components/components-core.php CHANGED
@@ -75,10 +75,11 @@ function amp_icon_css(){
75
  // TODO: https://github.com/ahmedkaludi/accelerated-mobile-pages/issues/2651
76
  echo $value;
77
  }
78
-
 
79
  // Add @font-face for Design-1,2,3
80
  if ( 1 == $redux_builder_amp['amp-design-selector'] || 2 == $redux_builder_amp['amp-design-selector'] || 3 == $redux_builder_amp['amp-design-selector'] ) { ?>
81
- @font-face {font-family: 'icomoon';font-style: normal;font-weight: normal;font-display: swap;src: local('icomoon'), local('icomoon'), url('<?php echo esc_url(plugin_dir_url(__FILE__)) ?>icomoon/icomoon.ttf');}
82
  [class^="icon-"], [class*=" icon-"] {font-family: 'icomoon';speak: none;font-style: normal;font-weight: normal;font-variant: normal;text-transform: none;line-height: 1;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;}
83
  <?php }
84
  }
75
  // TODO: https://github.com/ahmedkaludi/accelerated-mobile-pages/issues/2651
76
  echo $value;
77
  }
78
+ $icon_url = plugin_dir_url(__FILE__);
79
+ $icon_url = ampforwp_font_url($icon_url);
80
  // Add @font-face for Design-1,2,3
81
  if ( 1 == $redux_builder_amp['amp-design-selector'] || 2 == $redux_builder_amp['amp-design-selector'] || 3 == $redux_builder_amp['amp-design-selector'] ) { ?>
82
+ @font-face {font-family: 'icomoon';font-style: normal;font-weight: normal;font-display: swap;src: local('icomoon'), local('icomoon'), url('<?php echo esc_url($icon_url) ?>icomoon/icomoon.ttf');}
83
  [class^="icon-"], [class*=" icon-"] {font-family: 'icomoon';speak: none;font-style: normal;font-weight: normal;font-variant: normal;text-transform: none;line-height: 1;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;}
84
  <?php }
85
  }
components/social-icons/social-icons.php CHANGED
@@ -178,15 +178,18 @@ function ampforwp_is_associative(array $arr)
178
  add_action('amp_post_template_css','amp_social_styles',11);
179
 
180
 
181
- function amp_social_styles(){ ?>
 
 
 
182
  @font-face {
183
  font-family: 'icomoon';
184
  font-display: swap;
185
- src: url('<?php echo esc_url(plugin_dir_url(__FILE__)) ?>fonts/icomoon.eot');
186
- src: url('<?php echo esc_url(plugin_dir_url(__FILE__)) ?>fonts/icomoon.eot') format('embedded-opentype'),
187
- url('<?php echo esc_url(plugin_dir_url(__FILE__)) ?>fonts/icomoon.ttf') format('truetype'),
188
- url('<?php echo esc_url(plugin_dir_url(__FILE__)) ?>fonts/icomoon.woff') format('woff'),
189
- url('<?php echo esc_url(plugin_dir_url(__FILE__)) ?>fonts/icomoon.svg') format('svg');
190
  font-weight: normal;
191
  font-style: normal;
192
  }
178
  add_action('amp_post_template_css','amp_social_styles',11);
179
 
180
 
181
+ function amp_social_styles(){
182
+ $icon_url = plugin_dir_url(__FILE__);
183
+ $icon_url = ampforwp_font_url($icon_url);
184
+ ?>
185
  @font-face {
186
  font-family: 'icomoon';
187
  font-display: swap;
188
+ src: url('<?php echo esc_url($icon_url) ?>fonts/icomoon.eot');
189
+ src: url('<?php echo esc_url($icon_url) ?>fonts/icomoon.eot') format('embedded-opentype'),
190
+ url('<?php echo esc_url($icon_url) ?>fonts/icomoon.ttf') format('truetype'),
191
+ url('<?php echo esc_url($icon_url) ?>fonts/icomoon.woff') format('woff'),
192
+ url('<?php echo esc_url($icon_url) ?>fonts/icomoon.svg') format('svg');
193
  font-weight: normal;
194
  font-style: normal;
195
  }
feeds/instant-article-feed.php CHANGED
@@ -26,11 +26,7 @@ header('Content-Type: ' . esc_attr(feed_content_type('rss2')) . '; charset=' . e
26
  else{
27
  $number_of_articles = 500;
28
  }
29
- if ( ampforwp_get_setting('hide-amp-ia-categories') ) {
30
- $exclude_cats = array_values(array_filter(ampforwp_get_setting('hide-amp-ia-categories')));
31
- $ia_args['category__not_in'] = $exclude_cats;
32
- }
33
-
34
  $ia_args = array(
35
  'post_status' => 'publish',
36
  'ignore_sticky_posts' => true,
@@ -48,6 +44,10 @@ header('Content-Type: ' . esc_attr(feed_content_type('rss2')) . '; charset=' . e
48
  ),
49
  )
50
  );
 
 
 
 
51
  if ( is_category() ) {
52
  $ia_args['category__in'] = get_queried_object_id();
53
  }
26
  else{
27
  $number_of_articles = 500;
28
  }
29
+
 
 
 
 
30
  $ia_args = array(
31
  'post_status' => 'publish',
32
  'ignore_sticky_posts' => true,
44
  ),
45
  )
46
  );
47
+ if ( ampforwp_get_setting('hide-amp-ia-categories') ) {
48
+ $exclude_cats = array_values(array_filter(ampforwp_get_setting('hide-amp-ia-categories')));
49
+ $ia_args['category__not_in'] = $exclude_cats;
50
+ }
51
  if ( is_category() ) {
52
  $ia_args['category__in'] = get_queried_object_id();
53
  }
images/ccpa_for_amp.png ADDED
Binary file
images/subdomain-image.jpg ADDED
Binary file
includes/admin-style.css CHANGED
@@ -899,7 +899,7 @@ span#ampforwp-clear-clcss-msg {line-height: 25px;}
899
  .backtoextensionlist{
900
  cursor: pointer;
901
  }
902
- .redux-main #redux-sticky{display: none}
903
 
904
  #info-ampforwp-beta-mode-notice{color: #263238; margin: 20px; background: #FFF9C4;border-color: #908204;}
905
 
899
  .backtoextensionlist{
900
  cursor: pointer;
901
  }
902
+ .ampforwp-redux-container .redux-main #redux-sticky{display: none}
903
 
904
  #info-ampforwp-beta-mode-notice{color: #263238; margin: 20px; background: #FFF9C4;border-color: #908204;}
905
 
includes/features/functions.php CHANGED
@@ -101,7 +101,7 @@ function ampforwp_is_front_page(){
101
  return true;
102
 
103
  // TRUE: When we have " A static page" in reading settings and custom frontpage in amp
104
- 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 && $get_amp_custom_frontpage_id) {
105
 
106
  $current_page = get_queried_object();
107
  if ( $current_page ) {
101
  return true;
102
 
103
  // TRUE: When we have " A static page" in reading settings and custom frontpage in amp
104
+ 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)) {
105
 
106
  $current_page = get_queried_object();
107
  if ( $current_page ) {
includes/features/performance/performance-functions.php CHANGED
@@ -10,7 +10,9 @@ function ampforwp_minify_html_output($content_buffer){
10
  $content_buffer = str_replace('trbidi="on"', '', $content_buffer);
11
  $content_buffer = str_replace("trbidi='on'", '', $content_buffer);
12
  //Picture-tag is not working in AMP #4051
13
- $content_buffer = preg_replace('/<picture(.*?)<amp-img(.*?)><\/amp-img>(.*?)<\/picture>/s', '<noscript><picture$1</picture></noscript><amp-img$2></amp-img>$3', $content_buffer);
 
 
14
  if(class_exists('SiteOrigin_Widgets_Bundle')){
15
  $content_buffer = preg_replace('/<amp-video id="sow-player(.*?)" class="(.*?)"(.*?)<\/amp-video>/', '<amp-video id="sow-player$1" class="$2" autoplay $3</amp-video>', $content_buffer);
16
  }
10
  $content_buffer = str_replace('trbidi="on"', '', $content_buffer);
11
  $content_buffer = str_replace("trbidi='on'", '', $content_buffer);
12
  //Picture-tag is not working in AMP #4051
13
+ if(preg_match('/<picture(.*?)<amp-img(.*?)><\/amp-img>(.*?)<\/picture>/s', $content_buffer)){
14
+ $content_buffer = preg_replace('/<picture(.*?)<amp-img(.*?)><\/amp-img>(.*?)<\/picture>/s', '<noscript><picture$1</picture></noscript><amp-img$2></amp-img>$3', $content_buffer);
15
+ }
16
  if(class_exists('SiteOrigin_Widgets_Bundle')){
17
  $content_buffer = preg_replace('/<amp-video id="sow-player(.*?)" class="(.*?)"(.*?)<\/amp-video>/', '<amp-video id="sow-player$1" class="$2" autoplay $3</amp-video>', $content_buffer);
18
  }
includes/options/admin-config.php CHANGED
@@ -562,6 +562,31 @@ $extension_listing_array = array(
562
  'store_url'=>'https://accounts.ampforwp.com',
563
  'is_activated'=>(is_plugin_active('jw-player-compatibility-for-amp/jwplayercompatibilityforamp.php')? 1 : 2),
564
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
565
  );
566
  $viewAllExtensions = array(
567
  'name'=>'View All Extensions',
562
  'store_url'=>'https://accounts.ampforwp.com',
563
  'is_activated'=>(is_plugin_active('jw-player-compatibility-for-amp/jwplayercompatibilityforamp.php')? 1 : 2),
564
  ),
565
+ array(
566
+ 'name'=>'CCPA for AMP',
567
+ 'class'=>'new-ext',
568
+ 'desc'=>'This extension allows you to comply with the privacy rules of CCPA',
569
+ 'img_src'=>AMPFORWP_IMAGE_DIR . '/ccpa_for_amp.png',
570
+ 'price'=>'$29',
571
+ 'url_link'=>'https://ampforwp.com/addons/ccpa-for-amp/',
572
+ 'plugin_active_path'=> 'ccpa-for-amp/ccpaforamp.php',
573
+ 'item_name'=>'CCPA for AMP',
574
+ 'store_url'=>'https://accounts.ampforwp.com',
575
+ 'is_activated'=>(is_plugin_active('ccpa-for-amp/ccpaforamp.php')? 1 : 2),
576
+ ),
577
+ array(
578
+ 'name'=>'Subdomain Endpoints for AMP',
579
+ 'class'=>'new-ext',
580
+ 'desc'=>'This extension allows you to add your own custom amp Endpoints as subdomian.',
581
+ 'img_src'=>AMPFORWP_IMAGE_DIR . '/subdomain-image.jpg',
582
+ 'price'=>'$39',
583
+ 'url_link'=>'https://ampforwp.com/addons/subdomain-endpoints-for-amp/#utm_source=options-panel&utm_medium=extension-tab_subdomain_endpoints_for_amp&utm_campaign=AMP%20Plugin',
584
+ 'plugin_active_path'=> 'subdomain-endpoints-for-amp/subdomain-endpoints-for-amp.php',
585
+ 'item_name'=>'Subdomain Endpoints for AMP',
586
+ 'store_url'=>'https://accounts.ampforwp.com',
587
+ 'is_activated'=>(is_plugin_active('subdomain-endpoints-for-amp/subdomain-endpoints-for-amp.php')? 1 : 2),
588
+ 'settingUrl'=>'{amp-subdomain-subsection}',
589
+ ),
590
  );
591
  $viewAllExtensions = array(
592
  'name'=>'View All Extensions',
includes/options/redux-core/templates/panel/container.tpl.php CHANGED
@@ -16,7 +16,7 @@ if ( ! defined( 'ABSPATH' ) ) {
16
  $expanded = ( $this->parent->args['open_expanded'] ) ? ' fully-expanded' : '' . ( ! empty( $this->parent->args['class'] ) ? ' ' . esc_attr( $this->parent->args['class'] ) : '' );
17
  $nonce = wp_create_nonce( "redux_ajax_nonce" . $this->parent->args['opt_name'] );
18
  ?>
19
- <div class="redux-container<?php echo esc_attr( $expanded ); ?>">
20
  <?php $action = ( $this->parent->args['database'] == "network" && $this->parent->args['network_admin'] && is_network_admin() ? './edit.php?action=redux_' . $this->parent->args['opt_name'] : './options.php' ) ?>
21
  <form method="post"
22
  action="<?php echo esc_attr($action); ?>"
16
  $expanded = ( $this->parent->args['open_expanded'] ) ? ' fully-expanded' : '' . ( ! empty( $this->parent->args['class'] ) ? ' ' . esc_attr( $this->parent->args['class'] ) : '' );
17
  $nonce = wp_create_nonce( "redux_ajax_nonce" . $this->parent->args['opt_name'] );
18
  ?>
19
+ <div class="redux-container ampforwp-redux-container<?php echo esc_attr( $expanded ); ?>">
20
  <?php $action = ( $this->parent->args['database'] == "network" && $this->parent->args['network_admin'] && is_network_admin() ? './edit.php?action=redux_' . $this->parent->args['opt_name'] : './options.php' ) ?>
21
  <form method="post"
22
  action="<?php echo esc_attr($action); ?>"
includes/thirdparty-compatibility.php CHANGED
@@ -49,6 +49,9 @@ function ampforwp_thirdparty_compatibility(){
49
  if(function_exists('thb_remove_youtube_controls')){
50
  remove_filter( 'embed_handler_html', 'thb_remove_youtube_controls', 10, 2 );
51
  }
 
 
 
52
  }
53
 
54
  //Updater to check license
49
  if(function_exists('thb_remove_youtube_controls')){
50
  remove_filter( 'embed_handler_html', 'thb_remove_youtube_controls', 10, 2 );
51
  }
52
+ if (function_exists('gpress_switch_theme')) {
53
+ remove_filter('the_content', 'add_data_atts');
54
+ }
55
  }
56
 
57
  //Updater to check license
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3.2
7
- Stable tag: 1.0.32
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -191,6 +191,19 @@ You can contact us from [here](https://ampforwp.com/contact/)
191
 
192
  == Changelog ==
193
 
 
 
 
 
 
 
 
 
 
 
 
 
 
194
  = 1.0.32 (6th March 2020) =
195
  * Fixed: Syntax breaking in advanced google analytics section #4228
196
  * Fixed: Optimize CSS (Tree shaking) not clearing on post update #4234
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3.2
7
+ Stable tag: 1.0.33
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
191
 
192
  == Changelog ==
193
 
194
+ = 1.0.33 (11th March 2020) =
195
+ * Fixed: Categories not Hiding in Instant Articles #4254
196
+ * Fixed: Error when activating imagify plugin #4260
197
+ * Fixed: Start attribute not working in ol tags #4243
198
+ * Fixed: Search form not working in template mode #4227 #4224
199
+ * Fixed: Save button was disappearing when theme build on Redux framework #4259
200
+ * Fixed: SVG tag was removing in anchor tag #4252
201
+ * Fixed: Filter added to modify font face URL's #4258
202
+ * Fixed: Elementor CSS not loading on frontpage in ALL in One SEO #4253
203
+ * Fixed: Undefined variable: get_amp_custom_frontpage_id #4265
204
+ * Fixed: Images are not showing in AMP with Neva Child Theme #4261
205
+ * Fixed: AMP Option panel improvements #4245 #4269
206
+
207
  = 1.0.32 (6th March 2020) =
208
  * Fixed: Syntax breaking in advanced google analytics section #4228
209
  * Fixed: Optimize CSS (Tree shaking) not clearing on post update #4234
templates/design-manager/design-1/style.php CHANGED
@@ -76,6 +76,7 @@ preg_match('/accelerated-mobile-pages/i', $icon_url, $matches);
76
  if(count($matches)==0){
77
  $icon_url = plugin_dir_url('accelerated-mobile-pages/accelerated-moblie-pages.php').'templates/design-manager/'.esc_attr($design).'/';
78
  }
 
79
  ?>
80
  #statcounter{width: 1px;height:1px;}
81
  .amp-wp-article amp-addthis{bottom: -38px;margin-left: 6px;}
76
  if(count($matches)==0){
77
  $icon_url = plugin_dir_url('accelerated-mobile-pages/accelerated-moblie-pages.php').'templates/design-manager/'.esc_attr($design).'/';
78
  }
79
+ $icon_url = ampforwp_font_url($icon_url);
80
  ?>
81
  #statcounter{width: 1px;height:1px;}
82
  .amp-wp-article amp-addthis{bottom: -38px;margin-left: 6px;}
templates/design-manager/design-3/style.php CHANGED
@@ -31,6 +31,7 @@ if ( ! defined( 'ABSPATH' ) ) {
31
  if(count($matches)==0){
32
  $icon_url = plugin_dir_url('accelerated-mobile-pages/accelerated-moblie-pages.php').'templates/design-manager/'.esc_attr($design).'/';
33
  }
 
34
  ?>
35
 
36
  /* Global Styling */
31
  if(count($matches)==0){
32
  $icon_url = plugin_dir_url('accelerated-mobile-pages/accelerated-moblie-pages.php').'templates/design-manager/'.esc_attr($design).'/';
33
  }
34
+ $icon_url = ampforwp_font_url($icon_url);
35
  ?>
36
 
37
  /* Global Styling */
templates/design-manager/swift/style.php CHANGED
@@ -13,6 +13,7 @@ preg_match('/accelerated-mobile-pages/i', $icon_url, $matches);
13
  if(count($matches)==0){
14
  $icon_url = plugin_dir_url('accelerated-mobile-pages/accelerated-moblie-pages.php').'templates/design-manager/'.esc_attr($design).'/';
15
  }
 
16
  $font_content = '';
17
  $font_content = ampforwp_get_setting('amp_font_selector_content_single');
18
  $header_type = ampforwp_get_setting('header-type');
@@ -706,14 +707,7 @@ padding-left: 20px;
706
  left: 0px;
707
  <?php } ?>
708
  }
709
- .artl-cnt ol li {counter-increment: step-counter;}
710
- .artl-cnt ol li::before {content: counter(step-counter);font-size: 16px;color: #000;position: absolute;
711
- <?php if( true == ampforwp_get_setting('amp-rtl-select-option') ) {?>
712
- right:0;
713
- <?php } else{ ?>
714
- left: 0px;
715
- <?php } ?>
716
- line-height: 1.2;top: 6px;}
717
  .sp-rt p strong, .pg p strong{font-weight: 700;}
718
  @supports (-webkit-overflow-scrolling: touch) {
719
  .m-ctr{overflow:initial;}
13
  if(count($matches)==0){
14
  $icon_url = plugin_dir_url('accelerated-mobile-pages/accelerated-moblie-pages.php').'templates/design-manager/'.esc_attr($design).'/';
15
  }
16
+ $icon_url = ampforwp_font_url($icon_url);
17
  $font_content = '';
18
  $font_content = ampforwp_get_setting('amp_font_selector_content_single');
19
  $header_type = ampforwp_get_setting('header-type');
707
  left: 0px;
708
  <?php } ?>
709
  }
710
+ .artl-cnt ol li {list-style-type: decimal;position: unset;padding: 0;}
 
 
 
 
 
 
 
711
  .sp-rt p strong, .pg p strong{font-weight: 700;}
712
  @supports (-webkit-overflow-scrolling: touch) {
713
  .m-ctr{overflow:initial;}
templates/features.php CHANGED
@@ -640,8 +640,6 @@ function ampforwp_new_dir( $dir ) {
640
  $content = preg_replace("/<\\/?" . $tag . "(.|\\s)*?>/",'',$content);
641
  }
642
  // regex on steroids from here on
643
- // issue #420
644
- $content = preg_replace("/<div\s(class=.*?)(href=((".'"|'."'".')(.*?)("|'."'".')))\s(width=("|'."'".')(.*?)("|'."'"."))>(.*)<\/div>/i", '<div $1>$11</div>', $content);
645
  $content = preg_replace('/<like\s(.*?)>(.*)<\/like>/i', '', $content);
646
  $content = preg_replace('/<g:plusone\s(.*?)>(.*)<\/g:plusone>/i', '', $content);
647
  $content = preg_replace('/imageanchor="1"/i', '', $content);
@@ -1712,7 +1710,7 @@ function ampforwp_replace_title_tags() {
1712
  }
1713
  // All in One SEO #2816
1714
  if ( class_exists('All_in_One_SEO_Pack') && ampforwp_is_front_page()){
1715
- $aiseop_title = $post = '';
1716
  $aiseop_title = get_post_meta( $post_id, '_aioseop_title', true );
1717
  if ( !empty($aiseop_title) ) {
1718
  $site_title = $aiseop_title;
640
  $content = preg_replace("/<\\/?" . $tag . "(.|\\s)*?>/",'',$content);
641
  }
642
  // regex on steroids from here on
 
 
643
  $content = preg_replace('/<like\s(.*?)>(.*)<\/like>/i', '', $content);
644
  $content = preg_replace('/<g:plusone\s(.*?)>(.*)<\/g:plusone>/i', '', $content);
645
  $content = preg_replace('/imageanchor="1"/i', '', $content);
1710
  }
1711
  // All in One SEO #2816
1712
  if ( class_exists('All_in_One_SEO_Pack') && ampforwp_is_front_page()){
1713
+ $aiseop_title = '';
1714
  $aiseop_title = get_post_meta( $post_id, '_aioseop_title', true );
1715
  if ( !empty($aiseop_title) ) {
1716
  $site_title = $aiseop_title;
templates/template-mode/template-mode.php CHANGED
@@ -74,6 +74,7 @@ Class AMPforWP_theme_mode{
74
  remove_filter( 'query_vars', 'ampforwp_custom_query_var' );
75
  remove_action( 'template_redirect', 'ampforwp_redirect_to_orginal_url' );
76
  remove_action('template_redirect', 'ampforwp_redirect_proper_qendpoint' );
 
77
  //Main files
78
  remove_action( 'init', 'ampforwp_add_custom_post_support',11);
79
  remove_action( 'init', 'ampforwp_add_custom_rewrite_rules', 25 );
@@ -171,7 +172,12 @@ Class AMPforWP_theme_mode{
171
  {{response}}
172
  </template>
173
  </div>';
174
- $content = preg_replace("/<form(.*?)action=[\"|'](.*?)[\"|'](.*?)id=[\"|']commentform[\"|'](.*?)>/s", '<form$1action-xhr="'.esc_url_raw($submit_url).'"$3id="commentform" $4 on="submit-success:commentform.reset()">'.$mustache, $content);
 
 
 
 
 
175
  }
176
  return $content;
177
  }
74
  remove_filter( 'query_vars', 'ampforwp_custom_query_var' );
75
  remove_action( 'template_redirect', 'ampforwp_redirect_to_orginal_url' );
76
  remove_action('template_redirect', 'ampforwp_redirect_proper_qendpoint' );
77
+ remove_action('get_search_form', 'ampforwp_search_form' );
78
  //Main files
79
  remove_action( 'init', 'ampforwp_add_custom_post_support',11);
80
  remove_action( 'init', 'ampforwp_add_custom_rewrite_rules', 25 );
172
  {{response}}
173
  </template>
174
  </div>';
175
+ if(preg_match('/method\s*=\s*"\s*get\s*"/', $content)){
176
+ $content = preg_replace("/<form(.*?)action=[\"|'](.*?)[\"|'](.*?)id=[\"|']commentform[\"|'](.*?)>/s", '<form$1action="'.esc_url_raw($submit_url).'"$3id="commentform" $4 on="submit-success:commentform.reset()">'.$mustache, $content);
177
+ }
178
+ if(preg_match('/method\s*=\s*"\s*post\s*"/', $content)){
179
+ $content = preg_replace("/<form action=[\"|'](.*?)[\"|'](.*?)id=[\"|']commentform[\"|'](.*?)>/s", '<form action-xhr="$1"$2id="commentform" $3 on="submit-success:commentform.reset()">'.$mustache, $content);
180
+ }
181
  }
182
  return $content;
183
  }