AMP for WP – Accelerated Mobile Pages - Version 0.9.98.17

Version Description

(19th November 2019) = * Fixed: Validation error of 'srcset' in 'amp-img' after Latest update of Divi Theme (From version 4.0.2) #3803 * Fixed: Logo is not resizing when using fixed width #3696 * Fixed: Fatal Error when "AMP FOR WP" is activated on AMP FOR WP Garage URL #3765 * Fixed: Images and Videos with Gutenberg does not have proper spacing #3634 * Fixed: Undefined variable: amp_url #3776 * Fixed: amp-image-lightbox markup is loading in paginated post even the image is not present #3700 * Fixed: Search results on/off option in amp #3786 * Fixed: Internal links are breaking in Persian language #3777 * Fixed: Use util function to get array component. Fixes #3778 #3842 * Fixed: Add Hyperlink option to Gallery module images. #3850 * Fixed: Need to remove WPBakery Page Builder Support Option #3855

Download this release

Release Info

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

Code changes from version 0.9.98.16 to 0.9.98.17

Files changed (20) hide show
  1. README.md +27 -14
  2. accelerated-moblie-pages.php +2 -2
  3. changelog.txt +26 -13
  4. components/logo/logo.php +6 -2
  5. includes/admin-style.css +6 -0
  6. includes/features/pagebuilders-support/pagebuilders_support.php +1 -25
  7. includes/features/performance/performance-functions.php +1 -0
  8. includes/options/admin-config.php +13 -2
  9. includes/vendor/amp/includes/amp-helper-functions.php +1 -1
  10. includes/vendor/amp/includes/amp-post-template-actions.php +2 -1
  11. includes/vendor/amp/includes/sanitizers/class-amp-img-sanitizer.php +1 -1
  12. includes/vendor/amp/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php +1 -1
  13. includes/vendor/vendor-changelog.txt +3 -1
  14. pagebuilder/modules/gallery-module.php +37 -2
  15. readme.txt +27 -21
  16. templates/custom-amp-content.php +1 -6
  17. templates/design-manager/design-3/single.php +2 -1
  18. templates/design-manager/swift/single.php +4 -2
  19. templates/design-manager/swift/style.php +1 -0
  20. templates/features.php +4 -4
README.md CHANGED
@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3
7
- Stable tag: 0.9.98.16
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -191,23 +191,36 @@ You can contact us from [here](https://ampforwp.com/contact/)
191
 
192
  == Changelog ==
193
 
 
 
 
 
 
 
 
 
 
 
 
 
 
194
  = 0.9.98.16 (18th November 2019) =
195
  * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
196
  * Improvement: Add filter to modify HTML attributes #3685
197
- * Fixed:Jetpack causing errors after update #3849
198
  * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
199
- * Fixed:[URGENT] Vuukle API KEY missing #3792
200
- * Fixed:Admin tool bar css is not loading #3788
201
- * Fixed:Hide button always showing on page #3762
202
- * Fixed:Meta description are not showing properly in genesis #3761
203
- * Fixed:Non-Responsive tables after version 0.9.98.9 #3746
204
- * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
205
- * Fixed:Homepage posts image alignment issue #3691
206
- * Fixed:Lightbox not working for single images #3683
207
- * Fixed:Notice: Undefined index: category #3829
208
- * Fixed:Notice: Undefined variable: category_name #3827
209
- * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
210
- * Fixed:Warning when trying to save the option #3800
211
 
212
  = 0.9.98.15 (15th November 2019) =
213
  * Improvement: New UX for AMP Options Panel #3520
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3
7
+ Stable tag: 0.9.98.17
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
191
 
192
  == Changelog ==
193
 
194
+ = 0.9.98.17 (19th November 2019) =
195
+ * Fixed: Validation error of 'srcset' in 'amp-img' after Latest update of Divi Theme (From version 4.0.2) #3803
196
+ * Fixed: Logo is not resizing when using fixed width #3696
197
+ * Fixed: Fatal Error when "AMP FOR WP" is activated on AMP FOR WP Garage URL #3765
198
+ * Fixed: Images and Videos with Gutenberg does not have proper spacing #3634
199
+ * Fixed: Undefined variable: amp_url #3776
200
+ * Fixed: amp-image-lightbox markup is loading in paginated post even the image is not present #3700
201
+ * Fixed: Search results on/off option in amp #3786
202
+ * Fixed: Internal links are breaking in Persian language #3777
203
+ * Fixed: Use util function to get array component. Fixes #3778 #3842
204
+ * Fixed: Add Hyperlink option to Gallery module images. #3850
205
+ * Fixed: Need to remove WPBakery Page Builder Support Option #3855
206
+
207
  = 0.9.98.16 (18th November 2019) =
208
  * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
209
  * Improvement: Add filter to modify HTML attributes #3685
210
+ * Fixed: Jetpack causing errors after update #3849
211
  * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
212
+ * Fixed: [URGENT] Vuukle API KEY missing #3792
213
+ * Fixed: Admin tool bar css is not loading #3788
214
+ * Fixed: Hide button always showing on page #3762
215
+ * Fixed: Meta description are not showing properly in genesis #3761
216
+ * Fixed: Non-Responsive tables after version 0.9.98.9 #3746
217
+ * Fixed: Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
218
+ * Fixed: Homepage posts image alignment issue #3691
219
+ * Fixed: Lightbox not working for single images #3683
220
+ * Fixed: Notice: Undefined index: category #3829
221
+ * Fixed: Notice: Undefined variable: category_name #3827
222
+ * Fixed: AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
223
+ * Fixed: Warning when trying to save the option #3800
224
 
225
  = 0.9.98.15 (15th November 2019) =
226
  * Improvement: New UX for AMP Options Panel #3520
accelerated-moblie-pages.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
- Version: 0.9.98.16
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
@@ -20,7 +20,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
20
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23
- define('AMPFORWP_VERSION','0.9.98.16');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
+ Version: 0.9.98.17
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
20
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23
+ define('AMPFORWP_VERSION','0.9.98.17');
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,22 +1,35 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 0.9.98.16 (18th November 2019) =
4
  * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
5
  * Improvement: Add filter to modify HTML attributes #3685
6
- * Fixed:Jetpack causing errors after update #3849
7
  * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
8
- * Fixed:[URGENT] Vuukle API KEY missing #3792
9
- * Fixed:Admin tool bar css is not loading #3788
10
- * Fixed:Hide button always showing on page #3762
11
- * Fixed:Meta description are not showing properly in genesis #3761
12
- * Fixed:Non-Responsive tables after version 0.9.98.9 #3746
13
- * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
14
- * Fixed:Homepage posts image alignment issue #3691
15
- * Fixed:Lightbox not working for single images #3683
16
- * Fixed:Notice: Undefined index: category #3829
17
- * Fixed:Notice: Undefined variable: category_name #3827
18
- * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
19
- * Fixed:Warning when trying to save the option #3800
20
 
21
  = 0.9.98.14 (7th OCTOBER 2019) =
22
  * Fixed: Value Attribute Stripping out from the forms added in the content. #3689
1
  == Changelog ==
2
 
3
+ = 0.9.98.17 (19th November 2019) =
4
+ * Fixed: Validation error of 'srcset' in 'amp-img' after Latest update of Divi Theme (From version 4.0.2) #3803
5
+ * Fixed: Logo is not resizing when using fixed width #3696
6
+ * Fixed: Fatal Error when "AMP FOR WP" is activated on AMP FOR WP Garage URL #3765
7
+ * Fixed: Images and Videos with Gutenberg does not have proper spacing #3634
8
+ * Fixed: Undefined variable: amp_url #3776
9
+ * Fixed: amp-image-lightbox markup is loading in paginated post even the image is not present #3700
10
+ * Fixed: Search results on/off option in amp #3786
11
+ * Fixed: Internal links are breaking in Persian language #3777
12
+ * Fixed: Use util function to get array component. Fixes #3778 #3842
13
+ * Fixed: Add Hyperlink option to Gallery module images. #3850
14
+ * Fixed: Need to remove WPBakery Page Builder Support Option #3855
15
+
16
  = 0.9.98.16 (18th November 2019) =
17
  * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
18
  * Improvement: Add filter to modify HTML attributes #3685
19
+ * Fixed: Jetpack causing errors after update #3849
20
  * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
21
+ * Fixed: [URGENT] Vuukle API KEY missing #3792
22
+ * Fixed: Admin tool bar css is not loading #3788
23
+ * Fixed: Hide button always showing on page #3762
24
+ * Fixed: Meta description are not showing properly in genesis #3761
25
+ * Fixed: Non-Responsive tables after version 0.9.98.9 #3746
26
+ * Fixed: Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
27
+ * Fixed: Homepage posts image alignment issue #3691
28
+ * Fixed: Lightbox not working for single images #3683
29
+ * Fixed: Notice: Undefined index: category #3829
30
+ * Fixed: Notice: Undefined variable: category_name #3827
31
+ * Fixed: AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
32
+ * Fixed: Warning when trying to save the option #3800
33
 
34
  = 0.9.98.14 (7th OCTOBER 2019) =
35
  * Fixed: Value Attribute Stripping out from the forms added in the content. #3689
components/logo/logo.php CHANGED
@@ -38,10 +38,14 @@ if( !function_exists( 'amp_framework_logo_styles' ) ){
38
  global $redux_builder_amp;
39
  $max_width = '190px';
40
  $width = (integer) ampforwp_default_logo('width');
41
- if ( true == ampforwp_get_setting('ampforwp-custom-logo-dimensions') && true == ampforwp_get_setting('ampforwp-custom-logo-dimensions-options') && 'flexible' == ampforwp_get_setting('ampforwp-custom-logo-dimensions-options') ) {
42
- $max_width = (integer) $redux_builder_amp['ampforwp-custom-logo-dimensions-slider'];
43
  $width = (integer) ampforwp_default_logo('width');
44
  $max_width = ceil(($width*$max_width)/100)."px";
 
 
 
 
45
  }
46
  $width .= 'px';
47
  ?>
38
  global $redux_builder_amp;
39
  $max_width = '190px';
40
  $width = (integer) ampforwp_default_logo('width');
41
+ if ( true == ampforwp_get_setting('ampforwp-custom-logo-dimensions') && 'flexible' == ampforwp_get_setting('ampforwp-custom-logo-dimensions-options') ) {
42
+ $max_width = (integer) ampforwp_get_setting('ampforwp-custom-logo-dimensions-slider');
43
  $width = (integer) ampforwp_default_logo('width');
44
  $max_width = ceil(($width*$max_width)/100)."px";
45
+ }elseif( true == ampforwp_get_setting('ampforwp-custom-logo-dimensions') && 'prescribed' == ampforwp_get_setting('ampforwp-custom-logo-dimensions-options') ) {
46
+ $max_width = (integer) ampforwp_get_setting('opt-media-width');
47
+ $width = (integer) ampforwp_default_logo('width');
48
+ $max_width .="px";
49
  }
50
  $width .= 'px';
51
  ?>
includes/admin-style.css CHANGED
@@ -80,6 +80,12 @@ body #toplevel_page_amp_options .wp-menu-image{
80
  margin: 0;
81
  background-image: url(data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0iTGF5ZXJfMzUiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDY0IDY0IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgNjQgNjQiIHdpZHRoPSI1MTJweCI+PHBhdGggZD0ibTggNTYuODItMyA1LjE4aDU3di00M3oiIGZpbGw9IiNjZjllNzYiLz48cGF0aCBkPSJtNDUgOGM2LjA4IDAgMTEgNC45MiAxMSAxMXMtNC45MiAxMS0xMSAxMS0xMS00LjkyLTExLTExIDQuOTItMTEgMTEtMTF6bTUgMTFjMC0yLjc2LTIuMjQtNS01LTVzLTUgMi4yNC01IDUgMi4yNCA1IDUgNSA1LTIuMjQgNS01eiIgZmlsbD0iI2ZjZDc3MCIvPjxwYXRoIGQ9Im00MS40MiAzMy41NnYtLjAxYy0xLjQ5LS4zNi0yLjktLjk1LTQuMTgtMS43M2wtMi4xNCAxLjMyLTQuMjQtNC4yNCAxLjMyLTIuMTRjLS43OC0xLjI4LTEuMzctMi42OS0xLjczLTQuMThsLS4xOS0uMDVjLjQ4LS40OS43NC0xLjE1Ljc0LTEuODQgMC0xLjQ5LTEuMi0yLjY5LTIuNjktMi42OWgtLjMxdi0ybDIuNDUtLjU4Yy4zNi0xLjQ5Ljk1LTIuOSAxLjczLTQuMThsLTEuMzItMi4xNCA0LjI0LTQuMjQgMi4xNCAxLjMyYzEuMjgtLjc4IDIuNjktMS4zNyA0LjE4LTEuNzNsLjU4LTIuNDVoNmwuNTggMi40NWMxLjQ5LjM2IDIuOS45NSA0LjE4IDEuNzNsMi4xNC0xLjMyIDQuMjQgNC4yNC0xLjMyIDIuMTRjLjc4IDEuMjggMS4zNyAyLjY5IDEuNzMgNC4xOGwyLjQ1LjU4djUgMWwtMi40NS41OGMtLjM2IDEuNDktLjk1IDIuOS0xLjczIDQuMThsMS4zMiAyLjE0LTQuMjQgNC4yNC0yLjE0LTEuMzJjLTEuMjguNzgtMi42OSAxLjM3LTQuMTggMS43M2wtLjU4IDIuNDVoLTZ6bTE0LjU4LTE0LjU2YzAtNi4wOC00LjkyLTExLTExLTExcy0xMSA0LjkyLTExIDExIDQuOTIgMTEgMTEgMTEgMTEtNC45MiAxMS0xMXoiIGZpbGw9IiNmZmM3MjkiLz48cGF0aCBkPSJtOCA1Ni44MnYyLjE4YzAgLjgzLS4zNCAxLjU4LS44OCAyLjEycy0xLjI5Ljg4LTIuMTIuODhjLTEuNjYgMC0zLTEuMzQtMy0zdi0xOWMwIDIuMjEgMS43OSA0IDQgNGgyeiIgZmlsbD0iIzgzOGY5YiIvPjxwYXRoIGQ9Im0yMCA0OC40N3YyLjUzYzAgMS42Ni0xLjM0IDMtMyAzLS44MyAwLTEuNTgtLjM0LTIuMTItLjg4LS4yMS0uMjEtLjM5LS40Ni0uNTQtLjczLS4yMi0uNDEtLjM0LS44OS0uMzQtMS4zOXYtNmMwLS41NS0uNDUtMS0xLTFoLTUtMmMtMi4yMSAwLTQtMS43OS00LTR2LTJoMTEgM2MyLjIxIDAgNCAxLjc5IDQgNHoiIGZpbGw9IiM4MzhmOWIiLz48cGF0aCBkPSJtMzEgMjAuNjljMCAuNjktLjI2IDEuMzUtLjc0IDEuODQtLjA5LjEtLjE5LjE5LS4zLjI4bC02LjM0IDQuOTNjLTEuMDUuODItMi4zNCAxLjI2LTMuNjggMS4yNmgtNi45NHY5aC0xMXYtNmMwLTQuNDIgMy41OC04IDgtOGgxIDcuMzNjLjQ0IDAgLjg2LS4xNCAxLjItLjRsNi43NS01LjA2Yy40Ny0uMzUgMS4wMy0uNTQgMS42Mi0uNTRoLjEuMzFjMS40OSAwIDIuNjkgMS4yIDIuNjkgMi42OXoiIGZpbGw9IiM1Y2Q2YjMiLz48Y2lyY2xlIGN4PSIxMSIgY3k9IjE4IiBmaWxsPSIjZjBkMGI0IiByPSI2Ii8+PHBhdGggZD0ibTIzLjE5MiA0OS40MzNoMS45ODZ2MS45OTloLTEuOTg2eiIgdHJhbnNmb3JtPSJtYXRyaXgoLjgyMSAtLjU3MiAuNTcyIC44MjEgLTI0LjQ4MyAyMi44NjkpIi8+PHBhdGggZD0ibTI1LjUxNCA0Mi43MzdoMTYuNTgzdjEuOTk5aC0xNi41ODN6IiB0cmFuc2Zvcm09Im1hdHJpeCguODIxIC0uNTcyIC41NzIgLjgyMSAtMTguOTMxIDI3LjE2NikiLz48cGF0aCBkPSJtNjAuMzY1IDE0LjU4OGMtLjMzMi0xLjE1OS0uNzk1LTIuMjc1LTEuMzgxLTMuMzMybDEuNDI2LTIuMzAzLTUuMzYzLTUuMzYzLTIuMzAzIDEuNDI2Yy0xLjA1Ny0uNTg2LTIuMTczLTEuMDQ5LTMuMzMyLTEuMzgxbC0uNjItMi42MzVoLTcuNTg0bC0uNjIgMi42MzVjLTEuMTU5LjMzMi0yLjI3NS43OTUtMy4zMzIgMS4zODFsLTIuMzAzLTEuNDI2LTUuMzYzIDUuMzYzIDEuNDI2IDIuMzAzYy0uNTg2IDEuMDU3LTEuMDQ5IDIuMTczLTEuMzgxIDMuMzMybC0yLjYzNS42MnYxLjkxNmMtLjQ3My4xMTktLjkyNS4zMi0xLjMxNi42MTRsLTYuNzUxIDUuMDYyYy0uMTcyLjEyOS0uMzg1LjItLjYuMmgtMi40NDRjMS4zMDEtMS4yNzIgMi4xMTEtMy4wNDIgMi4xMTEtNSAwLTMuODU5LTMuMTQxLTctNy03cy03IDMuMTQxLTcgN2MwIDIuMjg4IDEuMTA4IDQuMzE2IDIuODExIDUuNTk0LTMuMzkxIDEuMjkxLTUuODExIDQuNTY3LTUuODExIDguNDA2djggMTljMCAyLjIwNiAxLjc5NCA0IDQgNGg1OHYtNDAuMjA4LTEuNzkyLTUuNzkyem0tNTQuMzY1IDMuNDEyYzAtMi43NTcgMi4yNDMtNSA1LTVzNSAyLjI0MyA1IDUtMi4yNDMgNS01IDUtNS0yLjI0My01LTV6bTQgN2g4LjMzM2MuNjQ2IDAgMS4yODUtLjIxNCAxLjgtLjYwMWw2Ljc1LTUuMDYyYy4yOTEtLjIxNy42NS0uMzM3IDEuMDEzLS4zMzdoLjQxOGMuOTI5IDAgMS42ODYuNzU3IDEuNjg2IDEuNjg3IDAgLjUyNC0uMjM3IDEuMDA5LS42NTEgMS4zMzFsLTYuMzM4IDQuOTNjLS44NzIuNjc4LTEuOTYyIDEuMDUyLTMuMDcgMS4wNTJoLTcuOTQxdjloLTl2LTVjMC0zLjg1OSAzLjE0MS03IDctN3ptNiAxMmgtMnYtN2g1Ljk0MWMxLjU1IDAgMy4wNzYtLjUyMyA0LjI5OC0xLjQ3NWw1LjYzMy00LjM4MWMuMzA1Ljg5OC42ODIgMS43NjkgMS4xNDQgMi42bC0xLjQyNiAyLjMwMyA1LjM2MyA1LjM2MyAyLjMwMy0xLjQyNmMuNjI5LjM0OSAxLjI4NS42MzkgMS45NTMuODk5bC0xOC4yMDkgMTIuNjc1di00LjU1OGMwLTIuNzU3LTIuMjQzLTUtNS01em0tMTMgMmg5IDEgM2MxLjY1NCAwIDMgMS4zNDYgMyAzdjguOTk5YzAgMS4xMDQtLjg5NyAyLjAwMS0yLjAwMSAyLjAwMS0uNTM0IDAtMS4wMzctLjIwOC0xLjQxNS0uNTg2LS4zNzctLjM3OC0uNTg1LS44OC0uNTg1LTEuNDE0bC4wMDEtNmMwLTEuMTAzLS44OTctMi0yLTJoLTdjLTEuNjU0IDAtMy0xLjM0Ni0zLTN6bTYgNmg0bC0uMDAxIDUuOTk4di4wMDFjMCAuMzQ4LjA1OS42ODMuMTQ0IDEuMDExbC00LjE0MyAyLjg5NXptLTYgMTR2LTE1LjAyNmMuODM4LjYzNSAxLjg3IDEuMDI2IDMgMS4wMjZoMXYxNGMwIDEuMTAzLS44OTcgMi0yIDJzLTItLjg5Ny0yLTJ6bTU4IDJoLTUyLjU1NmMuMzQ0LS41OTEuNTU2LTEuMjY4LjU1Ni0ydi0xLjY1NWw1LjEyLTMuNTc4Yy4wMTguMDE5LjAzMS4wNDIuMDUuMDYxLjc1Ni43NTYgMS43NjEgMS4xNzIgMi44MjkgMS4xNzIgMi4yMDYgMCA0LjAwMS0xLjc5NSA0LjAwMS00LjAwMXYtMi4wMDVsMTkuNzg5LTEzLjc3NC40MTkgMS43OGg3LjU4NGwuNjItMi42MzVjMS4xNTktLjMzMiAyLjI3NS0uNzk1IDMuMzMyLTEuMzgxbDIuMzAzIDEuNDI2IDUuMzYzLTUuMzYzLTEuNDI2LTIuMzAzYy41ODYtMS4wNTcgMS4wNDktMi4xNzMgMS4zODEtMy4zMzJsLjYzNS0uMTQ5em0wLTM5Ljc5Mi0yLjI3My41MzUtLjE0Ni41OTZjLS4zMzYgMS4zNzYtLjg4MSAyLjY4OC0xLjYxNyAzLjkwM2wtLjMxOC41MjMgMS4yMjkgMS45ODYtMy4xMjMgMy4xMjMtMS45ODYtMS4yMjktLjUyMy4zMThjLTEuMjE1LjczNi0yLjUyNyAxLjI4MS0zLjkwMyAxLjYxN2wtLjU5Ni4xNDYtLjUzNiAyLjI3NGgtNC40MTZsLS41MzUtMi4yNzMtLjU5Ni0uMTQ2Yy0xLjM3Ni0uMzM2LTIuNjg4LS44ODEtMy45MDMtMS42MTdsLS41MjMtLjMxOC0xLjk4NiAxLjIyOS0zLjEyMy0zLjEyMyAxLjIyOS0xLjk4Ni0uMzE4LS41MjNjLS43LTEuMTU0LTEuMjItMi4zOTgtMS41NTktMy43LjMyNy0uNTU3LjUyMi0xLjE4Ny41MjItMS44NTYgMC0xLjc5OC0xLjI5NS0zLjI5NC0zLTMuNjE3di0uMjc3bDIuMjczLS41MzUuMTQ2LS41OTZjLjMzNi0xLjM3Ni44ODEtMi42ODggMS42MTctMy45MDNsLjMxOC0uNTIzLTEuMjI5LTEuOTg2IDMuMTIzLTMuMTIzIDEuOTg2IDEuMjI5LjUyMy0uMzE4YzEuMjE1LS43MzYgMi41MjctMS4yODEgMy45MDMtMS42MTdsLjU5Ni0uMTQ2LjUzNi0yLjI3NWg0LjQxNmwuNTM1IDIuMjczLjU5Ni4xNDZjMS4zNzYuMzM2IDIuNjg4Ljg4MSAzLjkwMyAxLjYxN2wuNTIzLjMxOCAxLjk4Ni0xLjIyOSAzLjEyMyAzLjEyMy0xLjIyOSAxLjk4Ni4zMTguNTIzYy43MzYgMS4yMTUgMS4yODEgMi41MjcgMS42MTcgMy45MDNsLjE0Ni41OTYgMi4yNzQuNTM2djQuMjA4eiIvPjxwYXRoIGQ9Im00NSA3Yy02LjYxNyAwLTEyIDUuMzgzLTEyIDEyczUuMzgzIDEyIDEyIDEyIDEyLTUuMzgzIDEyLTEyLTUuMzgzLTEyLTEyLTEyem0wIDIyYy01LjUxNCAwLTEwLTQuNDg2LTEwLTEwczQuNDg2LTEwIDEwLTEwIDEwIDQuNDg2IDEwIDEwLTQuNDg2IDEwLTEwIDEweiIvPjxwYXRoIGQ9Im00NSAxM2MtMy4zMDkgMC02IDIuNjkxLTYgNnMyLjY5MSA2IDYgNiA2LTIuNjkxIDYtNi0yLjY5MS02LTYtNnptMCAxMGMtMi4yMDYgMC00LTEuNzk0LTQtNHMxLjc5NC00IDQtNCA0IDEuNzk0IDQgNC0xLjc5NCA0LTQgNHoiLz48cGF0aCBkPSJtNTcgNTdoMnYyaC0yeiIvPjxwYXRoIGQ9Im01NyA1M2gydjJoLTJ6Ii8+PHBhdGggZD0ibTU3IDQ5aDJ2MmgtMnoiLz48cGF0aCBkPSJtMTEgNTdoMnYyaC0yeiIvPjxwYXRoIGQ9Im0xNSA1N2gydjJoLTJ6Ii8+PHBhdGggZD0ibTE5IDU3aDJ2MmgtMnoiLz48L3N2Zz4K);
82
  }
 
 
 
 
 
 
83
  .ampforwp-option-panel-view-pop .m-title{
84
  color: #000;
85
  margin: 0;
80
  margin: 0;
81
  background-image: url(data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0iTGF5ZXJfMzUiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDY0IDY0IiBoZWlnaHQ9IjUxMnB4IiB2aWV3Qm94PSIwIDAgNjQgNjQiIHdpZHRoPSI1MTJweCI+PHBhdGggZD0ibTggNTYuODItMyA1LjE4aDU3di00M3oiIGZpbGw9IiNjZjllNzYiLz48cGF0aCBkPSJtNDUgOGM2LjA4IDAgMTEgNC45MiAxMSAxMXMtNC45MiAxMS0xMSAxMS0xMS00LjkyLTExLTExIDQuOTItMTEgMTEtMTF6bTUgMTFjMC0yLjc2LTIuMjQtNS01LTVzLTUgMi4yNC01IDUgMi4yNCA1IDUgNSA1LTIuMjQgNS01eiIgZmlsbD0iI2ZjZDc3MCIvPjxwYXRoIGQ9Im00MS40MiAzMy41NnYtLjAxYy0xLjQ5LS4zNi0yLjktLjk1LTQuMTgtMS43M2wtMi4xNCAxLjMyLTQuMjQtNC4yNCAxLjMyLTIuMTRjLS43OC0xLjI4LTEuMzctMi42OS0xLjczLTQuMThsLS4xOS0uMDVjLjQ4LS40OS43NC0xLjE1Ljc0LTEuODQgMC0xLjQ5LTEuMi0yLjY5LTIuNjktMi42OWgtLjMxdi0ybDIuNDUtLjU4Yy4zNi0xLjQ5Ljk1LTIuOSAxLjczLTQuMThsLTEuMzItMi4xNCA0LjI0LTQuMjQgMi4xNCAxLjMyYzEuMjgtLjc4IDIuNjktMS4zNyA0LjE4LTEuNzNsLjU4LTIuNDVoNmwuNTggMi40NWMxLjQ5LjM2IDIuOS45NSA0LjE4IDEuNzNsMi4xNC0xLjMyIDQuMjQgNC4yNC0xLjMyIDIuMTRjLjc4IDEuMjggMS4zNyAyLjY5IDEuNzMgNC4xOGwyLjQ1LjU4djUgMWwtMi40NS41OGMtLjM2IDEuNDktLjk1IDIuOS0xLjczIDQuMThsMS4zMiAyLjE0LTQuMjQgNC4yNC0yLjE0LTEuMzJjLTEuMjguNzgtMi42OSAxLjM3LTQuMTggMS43M2wtLjU4IDIuNDVoLTZ6bTE0LjU4LTE0LjU2YzAtNi4wOC00LjkyLTExLTExLTExcy0xMSA0LjkyLTExIDExIDQuOTIgMTEgMTEgMTEgMTEtNC45MiAxMS0xMXoiIGZpbGw9IiNmZmM3MjkiLz48cGF0aCBkPSJtOCA1Ni44MnYyLjE4YzAgLjgzLS4zNCAxLjU4LS44OCAyLjEycy0xLjI5Ljg4LTIuMTIuODhjLTEuNjYgMC0zLTEuMzQtMy0zdi0xOWMwIDIuMjEgMS43OSA0IDQgNGgyeiIgZmlsbD0iIzgzOGY5YiIvPjxwYXRoIGQ9Im0yMCA0OC40N3YyLjUzYzAgMS42Ni0xLjM0IDMtMyAzLS44MyAwLTEuNTgtLjM0LTIuMTItLjg4LS4yMS0uMjEtLjM5LS40Ni0uNTQtLjczLS4yMi0uNDEtLjM0LS44OS0uMzQtMS4zOXYtNmMwLS41NS0uNDUtMS0xLTFoLTUtMmMtMi4yMSAwLTQtMS43OS00LTR2LTJoMTEgM2MyLjIxIDAgNCAxLjc5IDQgNHoiIGZpbGw9IiM4MzhmOWIiLz48cGF0aCBkPSJtMzEgMjAuNjljMCAuNjktLjI2IDEuMzUtLjc0IDEuODQtLjA5LjEtLjE5LjE5LS4zLjI4bC02LjM0IDQuOTNjLTEuMDUuODItMi4zNCAxLjI2LTMuNjggMS4yNmgtNi45NHY5aC0xMXYtNmMwLTQuNDIgMy41OC04IDgtOGgxIDcuMzNjLjQ0IDAgLjg2LS4xNCAxLjItLjRsNi43NS01LjA2Yy40Ny0uMzUgMS4wMy0uNTQgMS42Mi0uNTRoLjEuMzFjMS40OSAwIDIuNjkgMS4yIDIuNjkgMi42OXoiIGZpbGw9IiM1Y2Q2YjMiLz48Y2lyY2xlIGN4PSIxMSIgY3k9IjE4IiBmaWxsPSIjZjBkMGI0IiByPSI2Ii8+PHBhdGggZD0ibTIzLjE5MiA0OS40MzNoMS45ODZ2MS45OTloLTEuOTg2eiIgdHJhbnNmb3JtPSJtYXRyaXgoLjgyMSAtLjU3MiAuNTcyIC44MjEgLTI0LjQ4MyAyMi44NjkpIi8+PHBhdGggZD0ibTI1LjUxNCA0Mi43MzdoMTYuNTgzdjEuOTk5aC0xNi41ODN6IiB0cmFuc2Zvcm09Im1hdHJpeCguODIxIC0uNTcyIC41NzIgLjgyMSAtMTguOTMxIDI3LjE2NikiLz48cGF0aCBkPSJtNjAuMzY1IDE0LjU4OGMtLjMzMi0xLjE1OS0uNzk1LTIuMjc1LTEuMzgxLTMuMzMybDEuNDI2LTIuMzAzLTUuMzYzLTUuMzYzLTIuMzAzIDEuNDI2Yy0xLjA1Ny0uNTg2LTIuMTczLTEuMDQ5LTMuMzMyLTEuMzgxbC0uNjItMi42MzVoLTcuNTg0bC0uNjIgMi42MzVjLTEuMTU5LjMzMi0yLjI3NS43OTUtMy4zMzIgMS4zODFsLTIuMzAzLTEuNDI2LTUuMzYzIDUuMzYzIDEuNDI2IDIuMzAzYy0uNTg2IDEuMDU3LTEuMDQ5IDIuMTczLTEuMzgxIDMuMzMybC0yLjYzNS42MnYxLjkxNmMtLjQ3My4xMTktLjkyNS4zMi0xLjMxNi42MTRsLTYuNzUxIDUuMDYyYy0uMTcyLjEyOS0uMzg1LjItLjYuMmgtMi40NDRjMS4zMDEtMS4yNzIgMi4xMTEtMy4wNDIgMi4xMTEtNSAwLTMuODU5LTMuMTQxLTctNy03cy03IDMuMTQxLTcgN2MwIDIuMjg4IDEuMTA4IDQuMzE2IDIuODExIDUuNTk0LTMuMzkxIDEuMjkxLTUuODExIDQuNTY3LTUuODExIDguNDA2djggMTljMCAyLjIwNiAxLjc5NCA0IDQgNGg1OHYtNDAuMjA4LTEuNzkyLTUuNzkyem0tNTQuMzY1IDMuNDEyYzAtMi43NTcgMi4yNDMtNSA1LTVzNSAyLjI0MyA1IDUtMi4yNDMgNS01IDUtNS0yLjI0My01LTV6bTQgN2g4LjMzM2MuNjQ2IDAgMS4yODUtLjIxNCAxLjgtLjYwMWw2Ljc1LTUuMDYyYy4yOTEtLjIxNy42NS0uMzM3IDEuMDEzLS4zMzdoLjQxOGMuOTI5IDAgMS42ODYuNzU3IDEuNjg2IDEuNjg3IDAgLjUyNC0uMjM3IDEuMDA5LS42NTEgMS4zMzFsLTYuMzM4IDQuOTNjLS44NzIuNjc4LTEuOTYyIDEuMDUyLTMuMDcgMS4wNTJoLTcuOTQxdjloLTl2LTVjMC0zLjg1OSAzLjE0MS03IDctN3ptNiAxMmgtMnYtN2g1Ljk0MWMxLjU1IDAgMy4wNzYtLjUyMyA0LjI5OC0xLjQ3NWw1LjYzMy00LjM4MWMuMzA1Ljg5OC42ODIgMS43NjkgMS4xNDQgMi42bC0xLjQyNiAyLjMwMyA1LjM2MyA1LjM2MyAyLjMwMy0xLjQyNmMuNjI5LjM0OSAxLjI4NS42MzkgMS45NTMuODk5bC0xOC4yMDkgMTIuNjc1di00LjU1OGMwLTIuNzU3LTIuMjQzLTUtNS01em0tMTMgMmg5IDEgM2MxLjY1NCAwIDMgMS4zNDYgMyAzdjguOTk5YzAgMS4xMDQtLjg5NyAyLjAwMS0yLjAwMSAyLjAwMS0uNTM0IDAtMS4wMzctLjIwOC0xLjQxNS0uNTg2LS4zNzctLjM3OC0uNTg1LS44OC0uNTg1LTEuNDE0bC4wMDEtNmMwLTEuMTAzLS44OTctMi0yLTJoLTdjLTEuNjU0IDAtMy0xLjM0Ni0zLTN6bTYgNmg0bC0uMDAxIDUuOTk4di4wMDFjMCAuMzQ4LjA1OS42ODMuMTQ0IDEuMDExbC00LjE0MyAyLjg5NXptLTYgMTR2LTE1LjAyNmMuODM4LjYzNSAxLjg3IDEuMDI2IDMgMS4wMjZoMXYxNGMwIDEuMTAzLS44OTcgMi0yIDJzLTItLjg5Ny0yLTJ6bTU4IDJoLTUyLjU1NmMuMzQ0LS41OTEuNTU2LTEuMjY4LjU1Ni0ydi0xLjY1NWw1LjEyLTMuNTc4Yy4wMTguMDE5LjAzMS4wNDIuMDUuMDYxLjc1Ni43NTYgMS43NjEgMS4xNzIgMi44MjkgMS4xNzIgMi4yMDYgMCA0LjAwMS0xLjc5NSA0LjAwMS00LjAwMXYtMi4wMDVsMTkuNzg5LTEzLjc3NC40MTkgMS43OGg3LjU4NGwuNjItMi42MzVjMS4xNTktLjMzMiAyLjI3NS0uNzk1IDMuMzMyLTEuMzgxbDIuMzAzIDEuNDI2IDUuMzYzLTUuMzYzLTEuNDI2LTIuMzAzYy41ODYtMS4wNTcgMS4wNDktMi4xNzMgMS4zODEtMy4zMzJsLjYzNS0uMTQ5em0wLTM5Ljc5Mi0yLjI3My41MzUtLjE0Ni41OTZjLS4zMzYgMS4zNzYtLjg4MSAyLjY4OC0xLjYxNyAzLjkwM2wtLjMxOC41MjMgMS4yMjkgMS45ODYtMy4xMjMgMy4xMjMtMS45ODYtMS4yMjktLjUyMy4zMThjLTEuMjE1LjczNi0yLjUyNyAxLjI4MS0zLjkwMyAxLjYxN2wtLjU5Ni4xNDYtLjUzNiAyLjI3NGgtNC40MTZsLS41MzUtMi4yNzMtLjU5Ni0uMTQ2Yy0xLjM3Ni0uMzM2LTIuNjg4LS44ODEtMy45MDMtMS42MTdsLS41MjMtLjMxOC0xLjk4NiAxLjIyOS0zLjEyMy0zLjEyMyAxLjIyOS0xLjk4Ni0uMzE4LS41MjNjLS43LTEuMTU0LTEuMjItMi4zOTgtMS41NTktMy43LjMyNy0uNTU3LjUyMi0xLjE4Ny41MjItMS44NTYgMC0xLjc5OC0xLjI5NS0zLjI5NC0zLTMuNjE3di0uMjc3bDIuMjczLS41MzUuMTQ2LS41OTZjLjMzNi0xLjM3Ni44ODEtMi42ODggMS42MTctMy45MDNsLjMxOC0uNTIzLTEuMjI5LTEuOTg2IDMuMTIzLTMuMTIzIDEuOTg2IDEuMjI5LjUyMy0uMzE4YzEuMjE1LS43MzYgMi41MjctMS4yODEgMy45MDMtMS42MTdsLjU5Ni0uMTQ2LjUzNi0yLjI3NWg0LjQxNmwuNTM1IDIuMjczLjU5Ni4xNDZjMS4zNzYuMzM2IDIuNjg4Ljg4MSAzLjkwMyAxLjYxN2wuNTIzLjMxOCAxLjk4Ni0xLjIyOSAzLjEyMyAzLjEyMy0xLjIyOSAxLjk4Ni4zMTguNTIzYy43MzYgMS4yMTUgMS4yODEgMi41MjcgMS42MTcgMy45MDNsLjE0Ni41OTYgMi4yNzQuNTM2djQuMjA4eiIvPjxwYXRoIGQ9Im00NSA3Yy02LjYxNyAwLTEyIDUuMzgzLTEyIDEyczUuMzgzIDEyIDEyIDEyIDEyLTUuMzgzIDEyLTEyLTUuMzgzLTEyLTEyLTEyem0wIDIyYy01LjUxNCAwLTEwLTQuNDg2LTEwLTEwczQuNDg2LTEwIDEwLTEwIDEwIDQuNDg2IDEwIDEwLTQuNDg2IDEwLTEwIDEweiIvPjxwYXRoIGQ9Im00NSAxM2MtMy4zMDkgMC02IDIuNjkxLTYgNnMyLjY5MSA2IDYgNiA2LTIuNjkxIDYtNi0yLjY5MS02LTYtNnptMCAxMGMtMi4yMDYgMC00LTEuNzk0LTQtNHMxLjc5NC00IDQtNCA0IDEuNzk0IDQgNC0xLjc5NCA0LTQgNHoiLz48cGF0aCBkPSJtNTcgNTdoMnYyaC0yeiIvPjxwYXRoIGQ9Im01NyA1M2gydjJoLTJ6Ii8+PHBhdGggZD0ibTU3IDQ5aDJ2MmgtMnoiLz48cGF0aCBkPSJtMTEgNTdoMnYyaC0yeiIvPjxwYXRoIGQ9Im0xNSA1N2gydjJoLTJ6Ii8+PHBhdGggZD0ibTE5IDU3aDJ2MmgtMnoiLz48L3N2Zz4K);
82
  }
83
+ .redux-amp_slider-input-one-ampforwp-custom-logo-dimensions-slider{
84
+ display: none;
85
+ }
86
+ .redux-container-amp_slider .redux-amp_slider-container#ampforwp-custom-logo-dimensions-slider{
87
+ margin:0px;
88
+ }
89
  .ampforwp-option-panel-view-pop .m-title{
90
  color: #000;
91
  margin: 0;
includes/features/pagebuilders-support/pagebuilders_support.php CHANGED
@@ -1,15 +1,7 @@
1
  <?php
2
  use ReduxCore\ReduxFramework\Redux;
3
  function ampforwp_page_builders_support_options($opt_name){
4
- $wpbakery_for_ampchecker = $divi_pb_for_ampchecker = $elemntr_pb_for_ampchecker = array();
5
- $wpbakery_for_ampchecker = array(
6
- 'id' => 'wpbakery_pb_for_amp_info_normal',
7
- 'type' => 'info',
8
- 'required' => array(
9
- array('ampforwp-wpbakery-pb-for-amp', '=' , true),
10
- ),
11
- 'desc' => sprintf('<div style="background: #FFF9C4;padding: 12px;line-height: 1.6;margin: -45px -14px -18px -17px;"><b>%s</b> %s <a href="https://ampforwp.com/page-builder-compatibility-for-amp/" target="_blank">%s</a> extension.<br /> <div style="margin-top:4px;">(<a href="https://ampforwp.com/page-builder-compatibility-for-amp/" target="_blank">%s</a>)</div></div>',esc_html__( 'ONE LAST STEP REQUIRED:','accelerated-mobile-pages'),esc_html__( 'This feature requires', 'accelerated-mobile-pages' ),esc_html__( 'Page Builder For AMP', 'accelerated-mobile-pages'),esc_html__( 'Click here for more info', 'accelerated-mobile-pages' )),
12
- );
13
  $divi_pb_for_ampchecker = array(
14
  'id' => 'divi_pb_for_amp_info_normal',
15
  'type' => 'info',
@@ -60,22 +52,6 @@ $avia_pb_for_ampchecker = array(
60
  'default' => true
61
  );
62
  }
63
- $pb_for_amp[] = array(
64
- 'id' => 'ampforwp-wpbakery-pb-for-amp-accor',
65
- 'type' => 'section',
66
- 'title' => esc_html__('WPBakery Page Builder Compatibility', 'accelerated-mobile-pages'),
67
- 'indent' => true,
68
- 'layout_type' => 'accordion',
69
- 'accordion-open'=> 1,
70
- );
71
- $pb_for_amp[] = array(
72
- 'id' => 'ampforwp-wpbakery-pb-for-amp',
73
- 'type' => 'switch',
74
- 'title' => esc_html__('WPBakery Page Builder Support','accelerated-mobile-pages'),
75
- 'tooltip-subtitle' => esc_html__('Enable or Disable the WPBakery Page Builder support for AMP', 'accelerated-mobile-pages'),
76
- 'default' => false
77
- );
78
- $pb_for_amp[] = $wpbakery_for_ampchecker;
79
  $pb_for_amp[] = array(
80
  'id' => 'ampforwp-divi-pb-for-amp-accor',
81
  'type' => 'section',
1
  <?php
2
  use ReduxCore\ReduxFramework\Redux;
3
  function ampforwp_page_builders_support_options($opt_name){
4
+ $divi_pb_for_ampchecker = $elemntr_pb_for_ampchecker = array();
 
 
 
 
 
 
 
 
5
  $divi_pb_for_ampchecker = array(
6
  'id' => 'divi_pb_for_amp_info_normal',
7
  'type' => 'info',
52
  'default' => true
53
  );
54
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
55
  $pb_for_amp[] = array(
56
  'id' => 'ampforwp-divi-pb-for-amp-accor',
57
  'type' => 'section',
includes/features/performance/performance-functions.php CHANGED
@@ -2,6 +2,7 @@
2
  // 86. minify the content of pages
3
  add_filter('ampforwp_the_content_last_filter','ampforwp_minify_html_output');
4
  function ampforwp_minify_html_output($content_buffer){
 
5
  global $redux_builder_amp;
6
  if(!$redux_builder_amp['ampforwp_cache_minimize_mode']){
7
  return $content_buffer;
2
  // 86. minify the content of pages
3
  add_filter('ampforwp_the_content_last_filter','ampforwp_minify_html_output');
4
  function ampforwp_minify_html_output($content_buffer){
5
+ $content_buffer = str_replace('srcset=""', '', $content_buffer);
6
  global $redux_builder_amp;
7
  if(!$redux_builder_amp['ampforwp_cache_minimize_mode']){
8
  return $content_buffer;
includes/options/admin-config.php CHANGED
@@ -1498,13 +1498,15 @@ Redux::setArgs( "redux_builder_amp", $args );
1498
  $roles = '';
1499
  $metabox_access = ampforwp_get_setting('amp-meta-permissions');
1500
  if($metabox_access == 'admin'){
1501
- if(empty(ampforwp_get_setting('ampforwp-role-based-access'))){
 
1502
  $roles = array('administrator');
1503
  }else{
1504
  $roles = ampforwp_get_setting('ampforwp-role-based-access');
1505
  }
1506
  }else{
1507
- if(empty(ampforwp_get_setting('ampforwp-role-based-access'))){
 
1508
  $roles = array('administrator','editor');
1509
  }else{
1510
  $roles = ampforwp_get_setting('ampforwp-role-based-access');
@@ -2521,6 +2523,15 @@ Redux::setSection( $opt_name, array(
2521
  'default' => 1,
2522
  'required' => array( 'amp-mobile-redirection', '=' , 1 )
2523
  ),
 
 
 
 
 
 
 
 
 
2524
  array(
2525
  'id' => 'convert-internal-nonamplinks-to-amp',
2526
  'type' => 'switch',
1498
  $roles = '';
1499
  $metabox_access = ampforwp_get_setting('amp-meta-permissions');
1500
  if($metabox_access == 'admin'){
1501
+ $rba = ampforwp_get_setting('ampforwp-role-based-access');
1502
+ if(empty($rba)){
1503
  $roles = array('administrator');
1504
  }else{
1505
  $roles = ampforwp_get_setting('ampforwp-role-based-access');
1506
  }
1507
  }else{
1508
+ $rba = ampforwp_get_setting('ampforwp-role-based-access');
1509
+ if(empty($rba)){
1510
  $roles = array('administrator','editor');
1511
  }else{
1512
  $roles = ampforwp_get_setting('ampforwp-role-based-access');
2523
  'default' => 1,
2524
  'required' => array( 'amp-mobile-redirection', '=' , 1 )
2525
  ),
2526
+ array(
2527
+ 'id' => 'amp-redirection-search',
2528
+ 'class' => 'child_opt child_opt_arrow',
2529
+ 'type' => 'switch',
2530
+ 'title' => esc_html__('Search Pages', 'accelerated-mobile-pages'),
2531
+ 'tooltip-subtitle' => esc_html__('Enable/Disable Mobile redirection on Search Pages.','accelerated-mobile-pages'),
2532
+ 'default' => 1,
2533
+ 'required' => array( 'amp-mobile-redirection', '=' , 1 )
2534
+ ),
2535
  array(
2536
  'id' => 'convert-internal-nonamplinks-to-amp',
2537
  'type' => 'switch',
includes/vendor/amp/includes/amp-helper-functions.php CHANGED
@@ -2,7 +2,7 @@
2
  namespace AMPforWP\AMPVendor;
3
  function amp_get_permalink( $post_id ) {
4
  $pre_url = apply_filters( 'amp_pre_get_permalink', false, $post_id );
5
-
6
  if ( false !== $pre_url ) {
7
  return $pre_url;
8
  }
2
  namespace AMPforWP\AMPVendor;
3
  function amp_get_permalink( $post_id ) {
4
  $pre_url = apply_filters( 'amp_pre_get_permalink', false, $post_id );
5
+ $amp_url = '';
6
  if ( false !== $pre_url ) {
7
  return $pre_url;
8
  }
includes/vendor/amp/includes/amp-post-template-actions.php CHANGED
@@ -54,7 +54,8 @@ function amp_post_template_add_schemaorg_metadata( $amp_template ) {
54
  if ( empty( $metadata ) ) {
55
  return;
56
  }
57
- if( (ampforwp_get_setting('ampforwp-seo-yoast-schema') == false && ampforwp_get_setting('ampforwp-seo-selection') == 'yoast') || empty(ampforwp_get_setting('ampforwp-seo-selection')) ){
 
58
  ?>
59
  <script type="application/ld+json"><?php echo wp_json_encode( $metadata ); ?></script>
60
  <?php
54
  if ( empty( $metadata ) ) {
55
  return;
56
  }
57
+ $seo_sel = ampforwp_get_setting('ampforwp-seo-selection');
58
+ if( (ampforwp_get_setting('ampforwp-seo-yoast-schema') == false && ampforwp_get_setting('ampforwp-seo-selection') == 'yoast') || empty($seo_sel) ){
59
  ?>
60
  <script type="application/ld+json"><?php echo wp_json_encode( $metadata ); ?></script>
61
  <?php
includes/vendor/amp/includes/sanitizers/class-amp-img-sanitizer.php CHANGED
@@ -196,7 +196,7 @@ class AMP_Img_Sanitizer extends AMP_Base_Sanitizer {
196
  }
197
 
198
  public function get_scripts() {
199
- if ( $this->is_lightbox ) {
200
  $this->scripts[self::$script_slug_lightbox] = self::$script_src_lightbox;
201
  }
202
 
196
  }
197
 
198
  public function get_scripts() {
199
+ if ( $this->is_lightbox && (is_singular() || ampforwp_is_front_page())) {
200
  $this->scripts[self::$script_slug_lightbox] = self::$script_src_lightbox;
201
  }
202
 
includes/vendor/amp/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php CHANGED
@@ -1203,7 +1203,7 @@ class AMP_Tag_And_Attribute_Sanitizer extends AMP_Base_Sanitizer {
1203
  }
1204
 
1205
  // Check if the host contains invalid chars (hostCharIsValid: https://github.com/ampproject/amphtml/blob/af1e3a550feeafd732226202b8d1f26dcefefa18/validator/engine/parse-url.js#L62-L103).
1206
- $host = wp_parse_url( $url, PHP_URL_HOST );
1207
  if ( $host && preg_match( '/[!"#$%&\'()*+,\/:;<=>?@[\]^`{|}~\s]/i', $host ) ) {
1208
  return AMP_Rule_Spec::FAIL;
1209
  }
1203
  }
1204
 
1205
  // Check if the host contains invalid chars (hostCharIsValid: https://github.com/ampproject/amphtml/blob/af1e3a550feeafd732226202b8d1f26dcefefa18/validator/engine/parse-url.js#L62-L103).
1206
+ $host = AMP_WP_Utils::parse_url( $url, PHP_URL_HOST );
1207
  if ( $host && preg_match( '/[!"#$%&\'()*+,\/:;<=>?@[\]^`{|}~\s]/i', $host ) ) {
1208
  return AMP_Rule_Spec::FAIL;
1209
  }
includes/vendor/vendor-changelog.txt CHANGED
@@ -87,4 +87,6 @@ Reason: To extend the functionality of sidebars and Pagebuilder
87
  57. Telegram links has been whitelisted in anchor tags #3578
88
  58. Improvement in iframe #3563
89
  59. Condition added in Wistia sanitizer to disable scripts when AMP Page Builder is enabled. #3587
90
- 60. Added the Filter to modify attributes in HTML Tag #3685
 
 
87
  57. Telegram links has been whitelisted in anchor tags #3578
88
  58. Improvement in iframe #3563
89
  59. Condition added in Wistia sanitizer to disable scripts when AMP Page Builder is enabled. #3587
90
+ 60. Added the Filter to modify attributes in HTML Tag #3685
91
+ 61. Undefined variable amp_url issue fixed #3776
92
+ 62. Warnings fixed of util function to get array component #3778
pagebuilder/modules/gallery-module.php CHANGED
@@ -85,7 +85,20 @@ return array(
85
  ),
86
  'content_type'=>'css',
87
  ),
88
-
 
 
 
 
 
 
 
 
 
 
 
 
 
89
  ),
90
  'front_template'=> $output,
91
  'front_css'=> $css,
@@ -101,6 +114,28 @@ return array(
101
  'default' =>'',
102
  'content_type'=>'html',
103
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
104
  array(
105
  'type' =>'checkbox',
106
  'name' =>"image_layout",
@@ -115,7 +150,7 @@ return array(
115
  'content_type'=>'html',
116
  ),
117
  ),
118
- 'front_template'=>'{{if_img_upload}}<amp-img src="{{img_upload}}" width="{{image_width}}" height="{{image_height}}" {{if_image_layout}}layout="{{image_layout}}"{{ifend_image_layout}} alt="{{image_alt}}"></amp-img>{{ifend_img_upload}}'
119
  ),
120
  );
121
 
85
  ),
86
  'content_type'=>'css',
87
  ),
88
+ array(
89
+ 'type' =>'checkbox_bool',
90
+ 'name' =>"ampforwp_pb_gallery_hyperlink",
91
+ 'label' =>'Hyperlink',
92
+ 'tab' =>'customizer',
93
+ 'default' =>0,
94
+ 'content_type'=>'html',
95
+ 'options' =>array(
96
+ array(
97
+ 'label'=>'Make an Hyperlink Gallery',
98
+ 'value'=>1,
99
+ ),
100
+ ),
101
+ ),
102
  ),
103
  'front_template'=> $output,
104
  'front_css'=> $css,
114
  'default' =>'',
115
  'content_type'=>'html',
116
  ),
117
+ array(
118
+ 'type' =>'text',
119
+ 'name' =>"ampforwp_pb_hyperlink_link_gallery",
120
+ 'label' =>'URL',
121
+ 'tab' =>'customizer',
122
+ 'default' =>'#',
123
+ 'content_type'=>'html',
124
+ 'required' => array('ampforwp_pb_gallery_hyperlink'=>'1'),
125
+ ),
126
+ array(
127
+ 'type' =>'select',
128
+ 'name' =>'ampforwp_pb_gallery_link_open',
129
+ 'label' =>"Open link in",
130
+ 'tab' =>'customizer',
131
+ 'default' =>'new_page',
132
+ 'options_details'=>array(
133
+ 'new_page' =>'New tab',
134
+ 'same_page' =>'Same page'
135
+ ),
136
+ 'content_type'=>'html',
137
+ 'required' => array('ampforwp_pb_gallery_hyperlink'=>'1'),
138
+ ),
139
  array(
140
  'type' =>'checkbox',
141
  'name' =>"image_layout",
150
  'content_type'=>'html',
151
  ),
152
  ),
153
+ 'front_template'=>'{{if_condition_ampforwp_pb_gallery_hyperlink==1}} <a href="{{ampforwp_pb_hyperlink_link_gallery}}" {{if_condition_ampforwp_pb_gallery_link_open==new_page}}target="_blank"{{ifend_condition_ampforwp_pb_gallery_link_open_new_page}}>{{ifend_condition_ampforwp_pb_gallery_hyperlink_1}}{{if_img_upload}}<amp-img src="{{img_upload}}" width="{{image_width}}" height="{{image_height}}" {{if_image_layout}}layout="{{image_layout}}"{{ifend_image_layout}} alt="{{image_alt}}"></amp-img>{{ifend_img_upload}}{{if_condition_ampforwp_pb_gallery_hyperlink==1}}</a>{{ifend_condition_ampforwp_pb_gallery_hyperlink_1}}'
154
  ),
155
  );
156
 
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3
7
- Stable tag: 0.9.98.16
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -191,33 +191,39 @@ You can contact us from [here](https://ampforwp.com/contact/)
191
 
192
  == Changelog ==
193
 
 
 
 
 
 
 
 
 
 
 
 
 
 
194
  = 0.9.98.16 (18th November 2019) =
195
  * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
196
  * Improvement: Add filter to modify HTML attributes #3685
197
- * Fixed:Jetpack causing errors after update #3849
198
  * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
199
- * Fixed:[URGENT] Vuukle API KEY missing #3792
200
- * Fixed:Admin tool bar css is not loading #3788
201
- * Fixed:Hide button always showing on page #3762
202
- * Fixed:Meta description are not showing properly in genesis #3761
203
- * Fixed:Non-Responsive tables after version 0.9.98.9 #3746
204
- * Fixed:Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
205
- * Fixed:Homepage posts image alignment issue #3691
206
- * Fixed:Lightbox not working for single images #3683
207
- * Fixed:Notice: Undefined index: category #3829
208
- * Fixed:Notice: Undefined variable: category_name #3827
209
- * Fixed:AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
210
- * Fixed:Warning when trying to save the option #3800
211
 
212
  = 0.9.98.15 (15th November 2019) =
213
  * Improvement: New UX for AMP Options Panel #3520
214
  * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
215
 
216
- = 0.9.98.14 (7th OCTOBER 2019) =
217
- * Fixed: Value Attribute Stripping out from the forms added in the content. #3689
218
- * Fixed: Remove AAWP from extension list #3735
219
- * Fixed: Data is not saving while Importing options from the json file #3667
220
- * Fixed: Debug warning #3723, #3729, #3730, #3731
221
-
222
-
223
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
  Tested up to: 5.3
7
+ Stable tag: 0.9.98.17
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
191
 
192
  == Changelog ==
193
 
194
+ = 0.9.98.17 (19th November 2019) =
195
+ * Fixed: Validation error of 'srcset' in 'amp-img' after Latest update of Divi Theme (From version 4.0.2) #3803
196
+ * Fixed: Logo is not resizing when using fixed width #3696
197
+ * Fixed: Fatal Error when "AMP FOR WP" is activated on AMP FOR WP Garage URL #3765
198
+ * Fixed: Images and Videos with Gutenberg does not have proper spacing #3634
199
+ * Fixed: Undefined variable: amp_url #3776
200
+ * Fixed: amp-image-lightbox markup is loading in paginated post even the image is not present #3700
201
+ * Fixed: Search results on/off option in amp #3786
202
+ * Fixed: Internal links are breaking in Persian language #3777
203
+ * Fixed: Use util function to get array component. Fixes #3778 #3842
204
+ * Fixed: Add Hyperlink option to Gallery module images. #3850
205
+ * Fixed: Need to remove WPBakery Page Builder Support Option #3855
206
+
207
  = 0.9.98.16 (18th November 2019) =
208
  * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
209
  * Improvement: Add filter to modify HTML attributes #3685
210
+ * Fixed: Jetpack causing errors after update #3849
211
  * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
212
+ * Fixed: [URGENT] Vuukle API KEY missing #3792
213
+ * Fixed: Admin tool bar css is not loading #3788
214
+ * Fixed: Hide button always showing on page #3762
215
+ * Fixed: Meta description are not showing properly in genesis #3761
216
+ * Fixed: Non-Responsive tables after version 0.9.98.9 #3746
217
+ * Fixed: Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
218
+ * Fixed: Homepage posts image alignment issue #3691
219
+ * Fixed: Lightbox not working for single images #3683
220
+ * Fixed: Notice: Undefined index: category #3829
221
+ * Fixed: Notice: Undefined variable: category_name #3827
222
+ * Fixed: AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
223
+ * Fixed: Warning when trying to save the option #3800
224
 
225
  = 0.9.98.15 (15th November 2019) =
226
  * Improvement: New UX for AMP Options Panel #3520
227
  * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
228
 
 
 
 
 
 
 
 
229
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
templates/custom-amp-content.php CHANGED
@@ -176,12 +176,7 @@ function amp_content_editor_meta_save( $post_id ) {
176
  // Save data of Custom AMP Editor
177
  if ( isset( $_POST['ampforwp_custom_content_editor'] ) ) {
178
  $unsan_ampforwp_custom_content_editor = htmlentities($_POST[ 'ampforwp_custom_content_editor' ]);
179
- if ( function_exists('sanitize_textarea_field') ) {
180
- $ampforwp_custom_content_editor = sanitize_textarea_field( $unsan_ampforwp_custom_content_editor );
181
- }
182
- else{
183
- $ampforwp_custom_content_editor = implode( "\n", array_map( 'sanitize_text_field', explode( "\n", $unsan_ampforwp_custom_content_editor ) ));
184
- }
185
  update_post_meta($post_id, 'ampforwp_custom_content_editor', $ampforwp_custom_content_editor );
186
  }
187
  // Save data of Custom AMP Editor CheckBox
176
  // Save data of Custom AMP Editor
177
  if ( isset( $_POST['ampforwp_custom_content_editor'] ) ) {
178
  $unsan_ampforwp_custom_content_editor = htmlentities($_POST[ 'ampforwp_custom_content_editor' ]);
179
+ $ampforwp_custom_content_editor = sanitize_post( $unsan_ampforwp_custom_content_editor );
 
 
 
 
 
180
  update_post_meta($post_id, 'ampforwp_custom_content_editor', $ampforwp_custom_content_editor );
181
  }
182
  // Save data of Custom AMP Editor CheckBox
templates/design-manager/design-3/single.php CHANGED
@@ -30,7 +30,8 @@
30
  <ol class="clearfix">
31
  <?php
32
  $number_of_posts = 6;
33
- if( !empty(ampforwp_get_setting('ampforwp-design3-number-of-recent-posts')) ){
 
34
  $number_of_posts = (int) ampforwp_get_setting('ampforwp-design3-number-of-recent-posts');
35
  }
36
  while( amp_loop('start', array( 'posts_per_page' => $number_of_posts ) ) ): ?>
30
  <ol class="clearfix">
31
  <?php
32
  $number_of_posts = 6;
33
+ $rcp = ampforwp_get_setting('ampforwp-design3-number-of-recent-posts');
34
+ if(!empty($rcp) ){
35
  $number_of_posts = (int) ampforwp_get_setting('ampforwp-design3-number-of-recent-posts');
36
  }
37
  while( amp_loop('start', array( 'posts_per_page' => $number_of_posts ) ) ): ?>
templates/design-manager/swift/single.php CHANGED
@@ -221,7 +221,8 @@ do_action("ampforwp_single_design_type_handle_d1");
221
  <h3><?php echo esc_attr(ampforwp_translation($redux_builder_amp['amp-translator-recent-text'], 'Recent Posts' )); ?></h3>
222
  <?php
223
  $number_of_posts = 6;
224
- if( !empty(ampforwp_get_setting('ampforwp-number-of-recent-posts')) ){
 
225
  $number_of_posts = (int) ampforwp_get_setting('ampforwp-number-of-recent-posts');
226
  }
227
  while( amp_loop('start', array( 'posts_per_page' => $number_of_posts ) ) ): ?>
@@ -376,7 +377,8 @@ do_action("ampforwp_single_design_type_handle_d1");
376
  <h3><?php echo ampforwp_translation($redux_builder_amp['amp-translator-recent-text'], 'Recent Posts' ); ?></h3>
377
  <?php
378
  $number_of_posts = 6;
379
- if( !empty(ampforwp_get_setting('ampforwp-number-of-recent-posts')) ){
 
380
  $number_of_posts = (int) ampforwp_get_setting('ampforwp-number-of-recent-posts');
381
  }
382
  while( amp_loop('start', array( 'posts_per_page' => $number_of_posts ) ) ): ?>
221
  <h3><?php echo esc_attr(ampforwp_translation($redux_builder_amp['amp-translator-recent-text'], 'Recent Posts' )); ?></h3>
222
  <?php
223
  $number_of_posts = 6;
224
+ $rcp = ampforwp_get_setting('ampforwp-number-of-recent-posts');
225
+ if( !empty($rcp) ){
226
  $number_of_posts = (int) ampforwp_get_setting('ampforwp-number-of-recent-posts');
227
  }
228
  while( amp_loop('start', array( 'posts_per_page' => $number_of_posts ) ) ): ?>
377
  <h3><?php echo ampforwp_translation($redux_builder_amp['amp-translator-recent-text'], 'Recent Posts' ); ?></h3>
378
  <?php
379
  $number_of_posts = 6;
380
+ $rcp = ampforwp_get_setting('ampforwp-number-of-recent-posts');
381
+ if( !empty($rcp) ){
382
  $number_of_posts = (int) ampforwp_get_setting('ampforwp-number-of-recent-posts');
383
  }
384
  while( amp_loop('start', array( 'posts_per_page' => $number_of_posts ) ) ): ?>
templates/design-manager/swift/style.php CHANGED
@@ -669,6 +669,7 @@ if($redux_builder_amp['swift-social-position'] == 'below-content'){?>
669
  <?php } // H6 Ends
670
  // swift Content Heading Sizes Ends?>
671
  .cntn-wrp p, .cntn-wrp ul, .cntn-wrp ol{margin:0px 0px 30px 0px;word-break: break-word;}
 
672
  .artl-cnt ul li, .artl-cnt ol li{list-style-type: none;position: relative;
673
  <?php if( true == ampforwp_get_setting('amp-rtl-select-option') ) {?>
674
  padding-right:20px;
669
  <?php } // H6 Ends
670
  // swift Content Heading Sizes Ends?>
671
  .cntn-wrp p, .cntn-wrp ul, .cntn-wrp ol{margin:0px 0px 30px 0px;word-break: break-word;}
672
+ .cntn-wrp .wp-block-image,.wp-block-embed{margin:15px 0px;}
673
  .artl-cnt ul li, .artl-cnt ol li{list-style-type: none;position: relative;
674
  <?php if( true == ampforwp_get_setting('amp-rtl-select-option') ) {?>
675
  padding-right:20px;
templates/features.php CHANGED
@@ -245,10 +245,10 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
245
  return;
246
  }
247
  }
248
- // no-amphtml for search
249
- // if(is_search()){
250
- // return;
251
- // }
252
  // #872 no-amphtml if selected as hide from settings
253
  if ( is_category_amp_disabled() ) {
254
  return;
245
  return;
246
  }
247
  }
248
+ // Search results on/off option #3786
249
+ if(is_search() && false == ampforwp_get_setting('amp-redirection-search')){
250
+ return;
251
+ }
252
  // #872 no-amphtml if selected as hide from settings
253
  if ( is_category_amp_disabled() ) {
254
  return;