AMP for WP – Accelerated Mobile Pages - Version 1.0.15

Version Description

(17th January 2020) = * Fixed: Sticky Social icons's css not loading correctly on some pages #3980 * Fixed: Need to add option to hide "AMP version" in view source page(generator). #4000 * Fixed: Caption of image gallery not displaying #3993 * Fixed: Need to connect retina image functionality to In-content Related post thumbnails. #4007 * Fixed: easytoc-icon.png #4041 * Fixed: AMP links Error. #4016 * Fixed: Image alignment and Name is not showing AMP #4038 * Fixed: Need to sanitize amp-mowplayer tag when added in the content. #4044 * Fixed: Set the priority to high of the icomoon CSS to override every other CSS,in AMP page builder. #4035 * Fixed: when row Wrapper is set to 100%,static css of max width 90% is getting applied from tablet view mode to below #3999 * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067

Download this release

Release Info

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

Code changes from version 1.0.14 to 1.0.15

Files changed (17) hide show
  1. README.md +17 -480
  2. accelerated-moblie-pages.php +2 -2
  3. changelog.txt +13 -0
  4. images/easytoc-icon.png +0 -0
  5. includes/options/admin-config.php +7 -0
  6. includes/vendor/amp/includes/amp-post-template-actions.php +7 -5
  7. includes/vendor/amp/includes/sanitizers/class-amp-allowed-tags-generated.php +31 -0
  8. includes/vendor/amp/includes/sanitizers/class-amp-gallery-block-sanitizer-5-3.php +13 -1
  9. pagebuilder/config/moduleTemplate.php +1 -1
  10. pagebuilder/inc/admin-amp-page-builder.css +1 -1
  11. readme.txt +14 -4
  12. templates/design-manager/design-1/style.php +1 -1
  13. templates/design-manager/design-2/style.php +3 -0
  14. templates/design-manager/design-3/style.php +3 -0
  15. templates/design-manager/swift/single.php +37 -4
  16. templates/design-manager/swift/style.php +16 -2
  17. templates/features.php +87 -40
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.14
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -189,8 +189,24 @@ You can contact us from [here](https://ampforwp.com/contact/)
189
  10. Homepage of Design One
190
  11. Pingdom Speed Report for AMP
191
 
 
 
 
192
  == Changelog ==
193
 
 
 
 
 
 
 
 
 
 
 
 
 
 
194
  = 1.0.14 (14th January 2020) =
195
  * Fixed: Warning in accelerated-mobile-pages/includes/options/admin-config.php on line 1250 #4027
196
  * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
@@ -209,483 +225,4 @@ You can contact us from [here](https://ampforwp.com/contact/)
209
  * Fixed: GTM tags are not working in the updated version 1.0.9 but Google Analytics is working,Also in version 1.0.0 both are working fine #4059
210
  * Fixed: Matomo (Piwik) Analytics generating errors in Console. #4042
211
 
212
- = 1.0.12 (12th January 2020) =
213
- * Fixed: Detect Component and add or remove script accordingly #4067
214
-
215
- = 1.0.11 (11th January 2020) =
216
- * Fixed: In amp-pixel script adding automatically. #4057
217
-
218
- = 1.0.10 (10th January 2020) =
219
- * Improvement: Need a hook to use it in Woocomerce #4048
220
- * Fixed: Scripts are not adding properly if user is adding the content through embed #4040
221
- * Fixed: When Featured Image from The Content is turned on,the image is not displayed when Creating post from Gutenberg. #4022
222
-
223
- = 1.0.9 (8th January 2020) =
224
- * Fixed: Odd behaviour of Optimize CSS (Treeshaking),when turned off resolves the validation errors and when turned on adding unnecessary wp-block CSS. #4036
225
- * Fixed: After enable the Tree shaking feature the CSS not loading properly #4034
226
- * Fixed: fallback feature is not working on SVG images #4033
227
- * Fixed: Need to update the Form Sanitizer to allow only the required from #4010
228
- * Fixed: 404 error in console with Images having webp extension. #3983
229
-
230
- = 1.0.8 (2nd January 2020) =
231
- * Fixed: Need to add Rankmath's "Nofollow External Links" feature. #3970 (updated the code)
232
-
233
- = 1.0.7 (2nd January 2020) =
234
- * Improvement: Need to add Rankmath's "Nofollow External Links" feature. #3970
235
- * Improvement: Need to add floating button in extension list #3972
236
- * Fixed: AMP theme framework GDPR module should be connected to GDPR Compliancy in option panel. #3963
237
- * Fixed: Breadcrumbs are not properly displaying and working in updated version #3917
238
- * Fixed: amp-auto-ads script is loading in AMP-pages when Google site kit plugin is enable. #4009
239
- * Fixed: wp-block CSS is heavily loading even when tree shaking is enabled in core. (Page builder is enabled) #4014
240
-
241
- = 1.0.6 (31th December 2019) =
242
- * Improvement: Allow users to add custom script in amp by using amp theme frame work plugin or without plugin #3865
243
- * Improvement: Allow users to register scripts in proper way in AMP Theme Framework #3257
244
- * Improvement: Need to add filter to modify mobile redirection #3987
245
- * Improvement: Need to update Sabberworm/CSS folder. #4012
246
- * Improvement: Need to make compatibility with "Transposh WordPress Translation" plugin #3895
247
- * Fixed: Warning issue with "$amp_emplate->get('metadata')" undefined metadata #3967
248
- * Fixed: GDPR popup appears once agin after accepting it #3957
249
- * Fixed: AMP Page apears blank after adding script tag in Head Section of AMP Page Builder #3834
250
- * Fixed: when user is not an admin and the admin bar is getting displayed as gap on the site #3918
251
- * Fixed: Option Panel not saving in AMP FOR WP, it is giving 404 error #3768
252
- * Fixed: Page Builder Latest Posts Category Module #3927
253
- * Fixed: Error amp-iframe extension .js appears more than once #3810
254
- * Fixed: Query monitor is not working in our latest version. #4008
255
- * Fixed: Google Tag manager not firing properly #3826
256
- * Fixed: Undefined variable block_css #4021
257
-
258
- = 1.0.5 (30th December 2019) =
259
- * Fixed: Menu arrow icon not showing properly in mobile version #3995
260
- * Fixed: Google Tag manager not firing properly #3826
261
-
262
- = 1.0.4 (26th December 2019) =
263
- * Fixed: When Optimize CSS (beta) option is enabled AMP page is getting blank #3994
264
-
265
- = 1.0.3 (23th December 2019) =
266
- * Improvement: Filter in search form #3948
267
- * Improvement: Improvement of jetpack social icons #3907
268
- * Improvement: Need to add a Filter in amp tree shaking for adding custom CSS. #3971
269
- * Fixed: Icomoon.ttf is preloaded in Design 1 and Design 2. #3945
270
- * Fixed: Search translate text option is visible in swift but unused #3934
271
- * Fixed: Category module has minor bugs after the update. #3880
272
- * Fixed: Improvements required in RTL support in AMP #3938
273
- * Fixed: Save buttons are not looking good after WP 5.3 update #3985
274
- * Fixed: Video widget support in AMP #3841
275
- * Fixed: Time is not working in published date notice #3956
276
- * Fixed: Recoverable fatal error: Object of class DOM Node List could not be converted to string #3968
277
- * Fixed: In Amp struture data option if we added any schema then description generated in html format #3937
278
- * Fixed: Select Taxonomy and Select Category is getting blank in the category module of AMP page builder #3986
279
- * Fixed: Notice: Undefined offset: 0 in class-amp-post-template.php on line 378 #3992
280
- * Fixed: Undefined variable: designCss #3961
281
- * Fixed: Open Graph title is not displaying correctly with SEOPress in AMP. #3966
282
-
283
- = 1.0.2 (19th December 2019) =
284
- * Improvement: Need to add wordpress default Gutenburg editor 'Block' settings Compatibility in AMP #3320
285
- * Improvement: Need to make compatibility with the Imagify plugin #3908
286
- * Improvement: Taxonomy support in AMP Page Builder category module #3310
287
- * Improvement: Add support of fallback images in AMP #3790
288
- * Improvement: General code improvements part 3 #3941
289
- * Improvement: Drop down support in Alternative Menu in Mobile view. #2768
290
- * Fixed: The Alternate Menu does not redirecting to the AMP for the product category in menu items #3915
291
- * Fixed: Sub-Category Archives on AMP page should be connected to Change internal links to AMP option. #3924
292
- * Fixed: Debug warning : Undefined index element #3958
293
- * Fixed: MGID Ads are not loading when the Flexible AMP widget option is enabled in the AMP #3864
294
- * Fixed: The Close bar is not appearing menu check in mobile iPhone #3964
295
-
296
- = 1.0.1 (14th December 2019) =
297
- * Fixed: Telegram as social profile #3754
298
- * Fixed: Give default styling for `<small>` tag. #3879
299
- * Fixed: When pagination is enabled in Category Module,translation option should be given in Advanced. #3847
300
- * Fixed: An issue with Code module in AMP page puilder. #3833
301
- * Fixed: Getting an error while validating page when using Disqus comments #3871
302
- * Fixed: Content is updated programatically on /amp/ page view, bad revision is created #3822
303
- * Fixed: Custom Post types and taxonomies option should be only visible when Archives is enabled #3903
304
- * Fixed: After reloading 'Select Categories to Hide AMP', it shows empty #3898
305
- * Fixed: In exclude Categories option the "No items of this type were found." message is displaying #3900
306
- * Fixed: Cannot use a scalar value as an array #3823
307
- * Fixed: Debug warnings. #3932
308
- * Fixed: Google Tag manager not firing properly #3826
309
-
310
- = 1.0.0 (11th December 2019) =
311
- * Improvement: Need to clear amp treeshaking css for reset section button. #3916
312
- * Improvement: Need to add easy table of contents in extension list #3922
313
- * Fixed: If hide amp hide on post or pages from anywhere then that needs to redirect to 301 #3767
314
- * Fixed: Need to add filter in "wp_localize_script" #3764
315
- * Fixed: Need to add preload key requests for font icons #3752
316
- * Fixed: Advance footer options should not be hidden by default #3652
317
- * Fixed: Button Rel Attribute #3872
318
- * Fixed: Need to update the PWA for WP extension from the options panel #3888
319
- * Fixed: “View AMP” Button Showing CSS on frontend #3890
320
- * Fixed: Images get streched in new version of the AMP FOR WP Plugin #3914
321
- * Fixed: Need to remove one signal push notification button in pages. #3874
322
- * Fixed: when images are placed along with the anchor tag in gallery module of guntenberg editor the image src is getting unknown in AMP #3923
323
- * Fixed: When RTL is enabled,the menu in header is going to right but the elements in right are not moved to left. #3881
324
-
325
- = 0.9.98.22 (9th December 2019) =
326
- * Improvement: Need to add full short pixel plugin compatibility #3782
327
- * Fixed: Need to improve UI when "Saved" notification displays. #3856
328
- * Fixed: Need to show the Attention message when custom AMP editor box checked but there is no content in it #2866
329
- * Fixed: Issue with AMP page builder tool when images are inserted in slider module. #3780
330
- * Fixed: Hidden posts in AMP should not show in related posts #3839
331
- * Fixed: Make header Unsticky not working when Infinite scrolling is turned on. #3831
332
- * Fixed: The post title appears 2 times: after the parent category and after the child on breadcrumb. #3724
333
- * Fixed: data-block-on-consent missing in GTM code #3911
334
- * Fixed: Debug error #3910
335
- * Fixed: PHP Warnings from redux filesystem #3901
336
- * Fixed: Debug notice #3913
337
- * Fixed: Sidebar Widgets Default CSS should load on Woo commerce Sidebar #3912
338
- * Fixed: Images get streched in new version of the AMP FOR WP Plugin #3914
339
-
340
- = 0.9.98.21 (3th December 2019) =
341
- * Improvement: Fonts support in all three designs one, two and three along with the swift Theme #1914
342
- * Improvement: Need to create Testimonial slider in AMP Page Builder #2960
343
- * Improvement: Need to create an optional option for the side menu when people click on the text the links should be dropped. links sub links #3428
344
- * Improvement: Need to make compatibility with this plugin Stop Generating Image Sizes #3851
345
- * Improvement: Improve Matemo analytics integration #3757
346
- * Fixed: Breadcrumb breaks when '/' is present in category name #3769
347
- * Fixed: Back to top button CSS loading twice in Design 1,2,3. #3835
348
- * Fixed: Removing trbidi attribute #3687
349
- * Fixed: Upgrade to AdsforWP button not working properly. #3681
350
- * Fixed: Tooltip alignment is missing in Advertisement #3625
351
- * Fixed: Media queries are removing automatically in media queries merging process #3797
352
- * Fixed: Excerpt on homepage is not working properly. #3866
353
- * Fixed: Author links are redirecting to AMP even when the Archives is turned off. #3875
354
- * Fixed: Issue related to image height and width #3857
355
- * Fixed: Gutenberg Gallery Images are not displayed correctly when any option is selected in WordPress Content Gallery. #3868
356
- * Fixed: Google Tag manager not firing properly #3826
357
- * Fixed: After Update AMP option panel design is changing #3877
358
-
359
- = 0.9.98.20 (27th November 2019) =
360
- * Fixed: Menu closer icon is getting overlapped by the header part of firefox web browser #3744
361
- * Fixed: Instagram TV videos are not rendering into AMP #3812
362
- * Fixed: Need To move CTA button in header two in sidebar if the website layout is in mobile view #3669
363
- * Fixed: When the image is added from ThirstyAffiliate image block from Guntenber editor facing validation error #3706
364
- * Fixed: PHP Warning:DOMDocument::loadHTML(): Empty string supplied as input #3745
365
- * Fixed: When Convert AMP to WP theme (Beta) option is enabled Back to Top link functionality is not working #3695
366
- * Fixed: Post date always shows 3 hours ago #3624
367
- * Fixed: Gutenberg Design Bugs #3645
368
- * Fixed: Toolbar AMP link bug #3692
369
- * Fixed: Breadcrumb icommon symbol direction should be changed when RTL is enabled in Swift. #3678
370
- * Fixed: Extra CSS are loading in swift and AMP Layouts #3414
371
- * Fixed: Remove Digg and Google plus option form Social Sharing #3709
372
- * Fixed: When Yoast SEO plugin is activated the same excerpt shows #3708
373
- * Fixed: Allow people to use captions below thumbnails in gallery #3702
374
- * Fixed: Design improvements of D2 #3637
375
- * Fixed: Fatal error: Uncaught Error: Cannot use object of type stdClass as array (after 98.15) #3867
376
- * Fixed: In amp gallery need to make improvement in arrow #3860
377
- * Fixed: Performance issues in AMP FOR WP #3732
378
- * Fixed: Yoast Separator is converting from Hyphen to Dash #3783
379
- * Fixed: Multiple UX related modifactions #3869
380
- * Fixed: strpos() debug error after 19 update #3878
381
-
382
- = 0.9.98.19 (25th November 2019) =
383
- * Fixed: image transients should clear automatically #3781
384
- * Fixed: CTA button in header could be made no follow #3798
385
- * Fixed: In IOS screen, Menu cross button is not appearing in Swift design #3809
386
- * Fixed: Comment closed opion need to be removed. #3750
387
- * Fixed: In template mode Need to show extension setting panel. #3728
388
- * Fixed: Facebook comment is not changing language when we select another language #3710
389
- * Fixed: Single Sidebar data is visible in Homepage #3636
390
- * Fixed: Need to remove width from inline style on amp images #3741
391
- * Fixed: If permalinks is set as "/index.php/%year%/%monthnum%/%day%/%postname%/" then not working properly with Pagination #3537
392
- * Fixed: Canonical url is changing in cateogry pages when cateogry name start with amp #3694
393
- * Fixed: general fixes and improvements part 2 #3621
394
- * Fixed: Warning: strpos(): Empty needle in /home/statecer/public_html/wp-content/plugins/accelerated-mobile-pages/templates/features.php on line 5788 #3870
395
-
396
- = 0.9.98.18 (21th November 2019) =
397
- * Improvement: Show the number of shares with Sassy Social Share #3588
398
- * Fixed: Need to improvment in table code #3664
399
- * Fixed: Change internal links to AMP is not working when custom permalink having the extenison.html #3811
400
- * Fixed: Width of the recent posts and related posts thumbnail image should be same #3639
401
- * Fixed: Page should be full width if the page builder is used #3756
402
- * Fixed: Remove broken link on source code like - link rel="dns-prefetch" #3697
403
- * Fixed: leave a comment added when making pages with pagebuilder #3755
404
- * Fixed: Need to adding gaping for col 2 in AMP Pagebuilder #3796
405
- * Fixed: CSS issue. #3785
406
- * Fixed: Facebook comment is not changing language when we select another language #3710
407
- * Fixed: Verify button of Google Font API key is not working after update #3858
408
- * Fixed: Cache is not clearing after clicking clear cache button #3863
409
-
410
- = 0.9.98.17 (19th November 2019) =
411
- * Fixed: Validation error of 'srcset' in 'amp-img' after Latest update of Divi Theme (From version 4.0.2) #3803
412
- * Fixed: Logo is not resizing when using fixed width #3696
413
- * Fixed: Fatal Error when "AMP FOR WP" is activated on AMP FOR WP Garage URL #3765
414
- * Fixed: Images and Videos with Gutenberg does not have proper spacing #3634
415
- * Fixed: Undefined variable: amp_url #3776
416
- * Fixed: amp-image-lightbox markup is loading in paginated post even the image is not present #3700
417
- * Fixed: Search results on/off option in amp #3786
418
- * Fixed: Internal links are breaking in Persian language #3777
419
- * Fixed: Use util function to get array component. Fixes #3778 #3842
420
- * Fixed: Add Hyperlink option to Gallery module images. #3850
421
- * Fixed: Need to remove WPBakery Page Builder Support Option #3855
422
-
423
- = 0.9.98.16 (18th November 2019) =
424
- * Improvement: Need to make compatibility of Advance setting options of yoast seo into AMP #3684
425
- * Improvement: Add filter to modify HTML attributes #3685
426
- * Fixed: Jetpack causing errors after update #3849
427
- * Fixed: Facebook like button is not showing correctly after last update in design3 #3742
428
- * Fixed: [URGENT] Vuukle API KEY missing #3792
429
- * Fixed: Admin tool bar css is not loading #3788
430
- * Fixed: Hide button always showing on page #3762
431
- * Fixed: Meta description are not showing properly in genesis #3761
432
- * Fixed: Non-Responsive tables after version 0.9.98.9 #3746
433
- * Fixed: Wrong amphtml when static page is selected in reading settings along with ?amp endpoint #3717
434
- * Fixed: Homepage posts image alignment issue #3691
435
- * Fixed: Lightbox not working for single images #3683
436
- * Fixed: Notice: Undefined index: category #3829
437
- * Fixed: Notice: Undefined variable: category_name #3827
438
- * Fixed: AMP Dev mode when disabled throwing a fatal error in mobile mode for blog. #3824
439
- * Fixed: Warning when trying to save the option #3800
440
-
441
- = 0.9.98.15 (15th November 2019) =
442
- * Improvement: New UX for AMP Options Panel #3520
443
- * Improvement: Improvement done in "Want to clear the Cache?" option in Performance section #3828
444
-
445
- = 0.9.98.14 (7th OCTOBER 2019) =
446
- * Fixed: Value Attribute Stripping out from the forms added in the content. #3689
447
- * Fixed: Remove AAWP from extension list #3735
448
- * Fixed: Data is not saving while Importing options from the json file #3667
449
- * Fixed: Debug warning #3723, #3729, #3730, #3731
450
-
451
- = 0.9.98.13 (27th SEPTEMBER 2019) =
452
- * Improvements: Need to create an option to clear the cache in tree shaking #3680
453
- * Improvements: Only get the required dashicons for Admin Toolbar #3707
454
- * Fixed: When enabling Treeshaking it removes the Swift icons TTF #3665
455
- * Fixed: List numbers are not in position #3704
456
- * Fixed: Menu Auto closing when # in the url #3633
457
- * Fixed: Facebook Like script not loading #3633
458
-
459
- = 0.9.98.12 (25th SEPTEMBER 2019) =
460
- * Improvements: User wants Wordpress admin toolbar in the AMP area #3450
461
- * Improvements: we want the amp menu showing from left or right side both. #3095
462
- * Improvements: Add feature to increase width for facebook like button and also add feature of data-action="recommend" #3241
463
- * Improvements: Improvements in Design 1 2 and 3 option panel in Header section #3642
464
- * Fixed: Update Stops Google Analytics tracking #3690
465
- * Fixed: Lightbox not working for single images #3683
466
- * Fixed: Language of Menu not changing when changing website language #3522
467
- * Fixed: We need to allow people to turn off the social section fully #3613
468
- * Fixed: Ui Design issues #3616
469
- * Fixed: Dropcap option should only be enabled on the posts, not from pages. #3614
470
- * Fixed: Social share position is not working in single design 2#3627
471
- * Fixed: AMP text module is not working in Widget area #3644
472
- * Fixed: Social media icons and comments should be below the post content on pages #3647
473
- * Fixed: Breadcrumbs are breaking after enabling ""Post title on Breadcrumb" option #3648
474
- * Fixed: line share link is getting added when sharing on telegram#3666
475
- * Fixed: In social sharing Twitter Handle and Pretty Permalinks for Twitter Share? need to display child option of Twitter#3656
476
- * Fixed: Extension license dashboard improvements #3654
477
- * Fixed: Make the chat bubble into a email box for faster input #405
478
- * Fixed: Option to specify certain taxonomy only in Instant Article Feeds #1489
479
- * Fixed: Need to remove Legacy Pagebuilder option Safely #3609
480
- * Fixed: Default heading tag should load if no option is selected in Header Module #3651
481
- * Fixed: Pretty Permalinks for Twitter Share? option is not working #3662
482
-
483
- = 0.9.98.11 (20th SEPTEMBER 2019) =
484
- * Improvements: Improved AMP Advertisement option panel
485
- * Fixed: Mobile redirection causing extra redirects from /amp to /amp/ #3660
486
- * Fixed: The lightbox should not work for the image if any external link is added in its anchor tag. #3599
487
-
488
- = 0.9.98.10 (18th SEPTEMBER 2019) =
489
- * Improvements: Upgrade the analtyics integration with gtag.js #3538
490
- * Improvements: Need to optimize css classes #3650
491
- * Fixed: Small sized images are getting stretched in the lightbox. #3602
492
- * Fixed: Gutenberg Audio Module not working #3597
493
- * Fixed: Table (thead-th) styling issue after update #3661
494
- * Fixed: Issue with the post titles in single page (two H2 tags if logo is not inserted) #3641
495
- * Fixed: search results pages are showing up as 'no index' #3646
496
- * Fixed: Need to add support of shortcode in category pages #3653
497
- * Fixed: Custom post description migrates to image description #3606
498
- * Fixed: AMP for WP conflict with the CDN Enabler plugin #3631
499
- * Fixed: Warning in Error Log #3655
500
- * Fixed: Incorrect placeholder "Select the SEO Plugin" in drop-down in AMP option Panel #3663
501
-
502
- = 0.9.98.9 (16th SEPTEMBER 2019) =
503
- * Improvements: Need to implement Tree Shaking feature to remove access css from the AMP pages #2949
504
- * Improvements: Need to save Post Meta Field Revisions in WordPress #3548
505
- * Improvements: Add Role based Access to all the options #3480
506
- * Improvements: Need to improve import/export option. #3364
507
- * Improvements: Need to make compatibility with amp-connatix-player component #3524
508
- * Improvements: "Recent Posts below related posts" feature need to implement for the design three #3531
509
- * Improvements: Need to improve color picker library in AMP FOR WP Plugin #3461
510
- * Improvements: Recent Posts below Related needs new options #3518
511
- * Improvements: Excerpt length feature request for related post #2908
512
- * Improvements: Need to add the option date below the content #3445
513
- * Improvements: Need to hide time in traditional view option. #3453
514
- * Improvements: Add feature to go to non AMP page on next and previous links #3253
515
- * Improvements: Create a filter to Exclude Posts from Related Posts #3582
516
- * Improvements: Need to add a filter to remove options in sidebar in AMP #3416
517
- * Improvements: allow option to change the heading tag of Featured module #3560
518
- * Improvements: AAWP plugin for AMP compatibility in Extension list #3591
519
- * Fixed: Individual AMP Page (Bulk Edit) "hide by default" option not working #3610
520
- * Fixed: In Recent Posts below Related need to add which present in below below related post #3596
521
- * Fixed: Need to shift the Header Background Option and Header Elements option on top in Swift theme #3462
522
- * Fixed: Need to add 'By Last X Days' option for "In-Content Related Posts" #3219
523
- * Fixed: Need to add unique class name custom post type #3539
524
- * Fixed: Need to add Convert AMP to WP theme (Beta) tutorial link in tooltip of this option #3552
525
- * Fixed: Need to connect with Collapse references by default option of the footnotes plugin. #3586
526
- * Fixed: Do not generate the AMPhtml for Woocommerce Account Page #3619
527
- * Fixed: Need to place page builder in custom homepage even amp support is off on pages. #2914
528
- * Fixed: Need to allow the user to navigate if user is using iframe #3601
529
- * Fixed: Template mode: Need to changes/fixes #3590
530
- * Fixed: The lightbox should not work for the image if any external link is added in its anchor tag. #3599
531
- * Fixed: Improper amphtml on HomePage when WPML is activate #3341
532
- * Fixed: The GDPR consent not working due to passed as string. #3658
533
-
534
- = 0.9.98.8 (7th SEPTEMBER 2019) =
535
- * Improvements: AMP Option panel in mobile view #2603
536
- * Improvements: Need to make compatible with yoast seo primary category option #3551
537
- * Improvements: The "redirect chain" report taking extra steps to process. #3575
538
- * Improvements: Rank math Titles & Meta compatibility #3592
539
- * Improvements: Improvement in iframe #3563
540
- * Improvements: optimize the TEL link to remove validation and provide better UX #3581
541
- * Fixed: Need to check function exist get_cart_url as it is getting fatal error when only amp woocommere is active. #3584
542
- * Fixed: Change Internal Links to AMP #3561
543
- * Fixed: Rare issue with Yoast SEO/Excerpt #3511
544
- * Fixed: lighthouse issues #3547
545
- * Fixed: Gallery Captions not working #3536
546
- * Fixed: Table is not aligning properly in amp version #3549
547
- * Fixed: Getting Debug error ( cdn_url_main ) #3555
548
- * Fixed: Delete button gone in page builder in RTL language #3545
549
- * Fixed: caption design is different when comparing Gutenberg and classic editor #3573
550
- * Fixed: Image is not aligned properly #3542
551
- * Fixed: The extension 'amp-wistia-player' was found on this page, but is unused. Please remove this extension. #3587
552
- * Fixed: No Index issue #2303
553
- * Fixed: Need to create a basic tutorial for each elements of single in Swift #3499
554
- * Fixed: Facebook like button is not aligned properly #3589
555
- * Fixed: h1 was changed to h2 in the custom frontpage title after update #3546
556
- * Fixed: When using JNews AMP Extender, It makes posts blank #3526
557
- * Fixed: Infinite scroll script is adding in woocommerce archive pages #3570
558
- * Fixed: Clicky analytics option getting hidden when GTM is on #3585
559
- * Fixed: In add on mode when amp is in standard mode frontend is getting blank screen. #3508
560
- * Fixed: Proper escaping in facebook instant article #3564
561
- * Fixed: No Icon in Facebook Message when Font Awesome Icon type selected #3572
562
- * Fixed: yoast breadcrumb making all ul list in capital letters #3540
563
- * Fixed: Comments should be removed in the out put of Analytics Code #3593
564
- * Fixed: Related post excerpt is not working with horizontal design #3595
565
- * Fixed: Issue in Breacrumb if category has a comma #3598
566
- * Fixed: After last update the cookie bar text shows the html code (a href) instead of creating a link. #3617
567
-
568
- = 0.9.98.6 (31th AUGUST 2019) =
569
- * Improvements: Structured Data improvements #3567
570
- * Improvements: Addthis share button's postion field in 1,2 and 3 designs #3553
571
- * Fixed: Rare issue AMP settings are not getting saved showing popup error "There was a problem with your action. Please try again or reload the page." #3494
572
- * Fixed: Plugin removes Telegram links #3578
573
- * Fixed: amp-addthis validation error on pages #3580
574
- * Fixed: Spot.IM Comments not working on all designs #3568
575
- * Fixed: Incorrect title tags being generated #3565
576
- * Fixed: Reduce the size of auto inline css. #3115
577
-
578
- = 0.9.98.5 (27th AUGUST 2019) =
579
- * Improvements: Compatibility integrated with CDN enabler #3515
580
- * Improvements: banner ux section of AMP panel settings improved #3470
581
- * Improvements: Reduces the size of auto inline css ro avoid validation errors #3115
582
- * Improvements: Tooltip to show description about "Social Share links to AMP" and "No Follow All Your Social Links" #3456
583
- * Improvements: Avada pagebuilder compatibility feature integrated ( it will work when 'AMP PageBuilder Compatibility' extension is activate) #3550
584
- * Improvements: Avia pagebuilder(Enfold) feature integrated ( it will work when 'AMP PageBuilder Compatibility' extension is activate) #3559
585
- * Improvements: Filters to show or hide option on admin settings for Template-mode #3562
586
- * Fixed: When AMP Page builder is checked with Empty Content,Container is missing on AMP view #3488
587
- * Fixed: Validation error when adding featured video with Authentic theme #3535
588
- * Fixed: User Experience issue with Custom Home Page #2348
589
- * Fixed: Serach option should be enabled by default when user selected the design-3 #3485
590
- * Fixed: Logo's resize option should only display when the image is present #3471
591
- * Fixed: Row module settings popup header is overlapped while scrolling the options in AMP Page Builder #3467
592
- * Fixed: labeling of the 'Text font' option in 'Row module settings' of AMP Page builder renamed #3468
593
- * Fixed: When AMP takeover is enabled, the 'visit amp' on admin header should disabled #3502
594
- * Fixed: Homepage amphtml not getting generated when there are no posts added. #3504
595
- * Fixed: AMP cache description is getting overlap with the Checkbox description when amp cache extension is activate #3512
596
- * Fixed: Category module's pagination of AMP Page builder is not working #3509
597
- * Fixed: There is closing tag of 'a' tag in header-bar.php of design bar, for which there is no opening tag #3479
598
- * Fixed: Icons not loading When Icon Font Library is selected to Font Awesome from the AMP options #3501
599
- * Fixed: Shortcode placed with double brackets (i.e., [[shortcode]]) should not execute #3481
600
- * Fixed: One signal push notification should work properly on AMP if any CDN plugin is used #3340
601
- * Fixed: Extra options are being displayed after the search is completed in the AMP Options Panel #2874
602
- * Fixed: In alt attribute's content single quotes should removed #3492
603
- * Fixed: "amphtml" is not generatiing in sorce code when it comes to search results pages in non AMP #3458
604
- * Fixed: Woocommerce archives and shop page support should not be dependent on Archives [Category & Tags] option #3558
605
- * Fixed: noreferrer is getting added automatically, it should have what ever the user passes #3566
606
-
607
- = 0.9.98.4 (6th AUGUST 2019) =
608
- * Improvements: Pagebuilder Compatibility Options in 'AMP By Automattic' Addon Mode Settings #3507
609
- * Fixed: Design is breaking in swift theme when RTL option is enabled #3527
610
- * Fixed: Validation error when width and height is empty in the logo #3530
611
- * Fixed: 'Read more' link in excerpt for category module of AMP page builder #3510
612
- * Fixed: Mobile redirection causing extra redirects from /amp to /amp/ #3459
613
- * Fixed: "Recent Posts below Related Posts" option should show only when it is available for the theme #3528
614
-
615
- = 0.9.98.3 (2nd AUGUST 2019) =
616
- * Improvements: OpenGraph Support in AMP #3261
617
- * Improvements: Compatibility integrated with Cloudflare stream. #3230
618
- * Improvements: Pagebuilder Compatibility Options in 'AMP By Automattic' Addon Mode Settings #3507
619
- * Improvements: Some changes in AMP panel setting's defaults #3065
620
- * Fixed: Search bar is messed up after 3425 and 3000 #3491
621
- * Fixed: Lightbox effect not working with "Tablepress" when "Link To" option is selected in Attachment display settings #3451
622
- * Fixed: Fatal error Uncaught Error: Call to undefined function ampforwp_is_non_amp() #3464
623
- * Fixed: Ol and li design issue in swift theme on RTL mode #3457
624
- * Fixed: When AMP Page builder is checked with Empty Content, Container is missing on AMP view #3488
625
- * Fixed: rel=”nofollow” is getting replaced by rel=”noreferrer in links #3483
626
- * Fixed: In Archives Category & Tags option is disabled, the link should go to non-amp #3486
627
- * Fixed: Multiple H1 Tag Issues in AMP Version on Home and Category Pages in Design 3 #3466
628
- * Fixed: Allow href attribute value with associated apps property #3475
629
- * Fixed: Validation errors in amp category page when HotWP PRO theme is active #3455
630
- * Fixed: Compatibility issue with WP Offload Media Lite. #3460
631
- * Fixed: Fatal error Uncaught Error: Call to undefined method RevSliderFunctionsWP::check_for_shortcodes() #3465
632
- * Fixed: If a title is loading then only its markup should load otherwise not #3495
633
- * Fixed: In Template mode feature, some fixes #3478
634
- * Fixed: Meta description option should be enabled by default SEO #3505
635
- * Fixed: Fatal error Uncaught Error Class 'AMPforWP\AMPVendor\WP_Error' not found #3514
636
- * Fixed: After the upgrade, AMP Page Builder is not working! #3506
637
- * Fixed: Page builder content getting blank when we hit save. #3513
638
- * Fixed: Wp editor not loading when Using Page builder (with Gutenberg) #3517
639
- * Fixed: Single design 2 in Swift broken in one specific use case #3532
640
-
641
- = 0.9.98.2 (25ND JULY 2019) =
642
- * Fixed: Menu design issue in Design 3 #3489
643
- * Fixed: Fatal error when latest version of Smush pro plugin activated #3487
644
- * Fixed: After Version 0.9.98 update, Background Type gradient options are not showing in Row module of AMP pagebuilder #3490* Fixed: Undefined index ampforwp-amp-on-off #3474
645
- * Fixed: Search bar is not showing in design three after enabling the search option in header option panel #3484
646
- * Fixed: Content blank if Color Attribute is in Span tag #3497
647
- * Fixed: Sticky Header has no background color when scrolling. #3498
648
-
649
- = 0.9.98.1 (22nd July 2019) =
650
- * Fixed: Logo and headline comes togeather after .98 update #3472
651
- * Fixed: Default loading message as '1' in search bar after latest update (.98) #3476
652
-
653
- = 0.9.98 (19th July 2019) =
654
- * Improvements: Option to remove date from Homepage and also in Recent posts #3363
655
- * Improvements: Option for amp-youtube Embed video attributes in row module of AMP Pagebuilder #3373
656
- * Improvements: Menu sidebar background and elements color changing option for Design 1, 2 #3402
657
- * Improvements: MGID Ad support in AMP FOR WP #3431
658
- * Improvements: Sizes of featured image option for single 1 #3433
659
- * Improvements: Addthis floating share button feature in amp #3424
660
- * Improvements: Wistia Plugin Compatibility integrated #3386
661
- * Improvements: Squirrly SEO Compatibility integrated #3421
662
- * Improvements: image-slider compatibility added in AMP sanitizer #3422
663
- * Improvements: Compatability issue with ShortPixel Image Optimizer #3439
664
- * Improvements: Improve the Search form (Sidebar) design #3425
665
- * Improvements: AMP footer widget in design three #3411
666
- * Improvements: Extension list added for AMP Email Extension #3144
667
- * Improvements: Extension list added for Pinterest for AMP Extension #3195
668
- * Improvements: Extension list added for Liveblog For AMP Extension #3194
669
- * Fixed: Close menu button is not showing when a user comes from Google search #3401
670
- * Fixed: When High-resolution Images option is enabled images link should be generated from higher-order to lower-order in schema markup #3442
671
- * Fixed: Sticky Social Icons setting should be moved to Social Tab and some changes #3426
672
- * Fixed: Fall back the header type code in the backend if a user has not selected any header type #3419
673
- * Fixed: Revolution Slider not working perfectly when a user is inserting video #3311
674
- * Fixed: Call to action option should be automatically enabled if the user selected header type-2 #3420
675
- * Fixed: Double quotes on the author area #3441
676
- * Fixed: Twitter URL is displaying instead of an icon when Zox news theme is active #3409
677
- * Fixed: Extension code array issue #3438
678
- * Fixed: Validation error due to amp-facebook-like #3427
679
- * Fixed: Fatal error cannot redeclare is_amp_endpoint() (previously declared) #3415
680
- * Fixed: Sticky Social Icons and cookies banner style issue #3452
681
- * Fixed: Validation error the extension 'amp-next-page' was found on this page, but is unused please remove this extension #3463
682
- * Fixed: gallery/slider module is not working when Convert AMP to WP theme (Beta) option is enabled #2771
683
-
684
- = 0.9.97.65 (16th July 2019) =
685
- * Fixed: PHP Warning at the top of the site: array_merge(): Expected parameter 1 to be an array #3434
686
- * Fixed: Disqus comment is not working after version 0.9.97.63 #3446
687
- * Fixed: Uncaught Error: Call to undefined method WPSEO_Options::get() for Yoast Premium #3447
688
- * Fixed: Message: when Leverage Browser Caching is not supported #3449
689
- * Fixed: Added the missing parameter $depth in filter 'nav_menu_item_id' #3454
690
-
691
  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.2
7
+ Stable tag: 1.0.15
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
189
  10. Homepage of Design One
190
  11. Pingdom Speed Report for AMP
191
 
192
+ Device testing done through [BrowserStack](https://www.browserstack.com)
193
+ ![BrowserStack](https://user-images.githubusercontent.com/16618009/53022655-a24ea780-3481-11e9-9a48-a2ca5bcd96d6.png)
194
+
195
  == Changelog ==
196
 
197
+ = 1.0.15 (17th January 2020) =
198
+ * Fixed: Sticky Social icons's css not loading correctly on some pages #3980
199
+ * Fixed: Need to add option to hide "AMP version" in view source page(generator). #4000
200
+ * Fixed: Caption of image gallery not displaying #3993
201
+ * Fixed: Need to connect retina image functionality to In-content Related post thumbnails. #4007
202
+ * Fixed: easytoc-icon.png #4041
203
+ * Fixed: AMP links Error. #4016
204
+ * Fixed: Image alignment and Name is not showing AMP #4038
205
+ * Fixed: Need to sanitize amp-mowplayer tag when added in the content. #4044
206
+ * Fixed: Set the priority to high of the icomoon CSS to override every other CSS,in AMP page builder. #4035
207
+ * Fixed: when row Wrapper is set to 100%,static css of max width 90% is getting applied from tablet view mode to below #3999
208
+ * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
209
+
210
  = 1.0.14 (14th January 2020) =
211
  * Fixed: Warning in accelerated-mobile-pages/includes/options/admin-config.php on line 1250 #4027
212
  * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
225
  * Fixed: GTM tags are not working in the updated version 1.0.9 but Google Analytics is working,Also in version 1.0.0 both are working fine #4059
226
  * Fixed: Matomo (Piwik) Analytics generating errors in Console. #4042
227
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
228
  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.14
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.14');
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.15
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.15');
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.14 (14th January 2020) =
4
  * Fixed: Warning in accelerated-mobile-pages/includes/options/admin-config.php on line 1250
5
  * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
1
  == Changelog ==
2
 
3
+ = 1.0.15 (17th January 2020) =
4
+ * Fixed: Sticky Social icons's css not loading correctly on some pages #3980
5
+ * Fixed: Need to add option to hide "AMP version" in view source page(generator). #4000
6
+ * Fixed: Caption of image gallery not displaying #3993
7
+ * Fixed: Need to connect retina image functionality to In-content Related post thumbnails. #4007
8
+ * Fixed: easytoc-icon.png #4041
9
+ * Fixed: AMP links Error. #4016
10
+ * Fixed: Image alignment and Name is not showing AMP #4038
11
+ * Fixed: Need to sanitize amp-mowplayer tag when added in the content. #4044
12
+ * Fixed: Set the priority to high of the icomoon CSS to override every other CSS,in AMP page builder. #4035
13
+ * Fixed: when row Wrapper is set to 100%,static css of max width 90% is getting applied from tablet view mode to below #3999
14
+ * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
15
+
16
  = 1.0.14 (14th January 2020) =
17
  * Fixed: Warning in accelerated-mobile-pages/includes/options/admin-config.php on line 1250
18
  * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
images/easytoc-icon.png ADDED
Binary file
includes/options/admin-config.php CHANGED
@@ -2648,6 +2648,13 @@ Redux::setSection( $opt_name, array(
2648
  'tooltip-subtitle' => esc_html__('Enable if you want all your links inside the article to go to /amp/. All the outbound links will remain untouched.','accelerated-mobile-pages'),
2649
  'default' => 0,
2650
  ),
 
 
 
 
 
 
 
2651
  array(
2652
  'id' => 'ampforwp-smooth-scrolling-for-links',
2653
  'type' => 'switch',
2648
  'tooltip-subtitle' => esc_html__('Enable if you want all your links inside the article to go to /amp/. All the outbound links will remain untouched.','accelerated-mobile-pages'),
2649
  'default' => 0,
2650
  ),
2651
+ array(
2652
+ 'id' => 'hide-amp-version-from-source',
2653
+ 'type' => 'switch',
2654
+ 'title' => esc_html__('Hide AMP Version', 'accelerated-mobile-pages'),
2655
+ 'tooltip-subtitle' => esc_html__('Enable if you want hide AMP version in view source page(generator).','accelerated-mobile-pages'),
2656
+ 'default' => 0,
2657
+ ),
2658
  array(
2659
  'id' => 'ampforwp-smooth-scrolling-for-links',
2660
  'type' => 'switch',
includes/vendor/amp/includes/amp-post-template-actions.php CHANGED
@@ -18,11 +18,13 @@ function amp_post_template_add_canonical( $amp_template ) {
18
  <link rel="canonical" href="<?php echo esc_url( apply_filters('ampforwp_modify_rel_url',$amp_template->get( 'canonical_url' ) ) ); ?>" />
19
  <?php
20
  }
21
- add_action( 'amp_post_template_head', 'AMPforWP\\AMPVendor\\amp_post_template_add_meta_generator' );
22
- function amp_post_template_add_meta_generator() {
23
- ?>
24
- <meta name="generator" content="AMP for WP <?php echo esc_attr(AMPFORWP_VERSION) ?>" />
25
- <?php
 
 
26
  }
27
 
28
  add_action( 'amp_post_template_head', 'AMPforWP\\AMPVendor\\amp_post_template_add_cached_link' );
18
  <link rel="canonical" href="<?php echo esc_url( apply_filters('ampforwp_modify_rel_url',$amp_template->get( 'canonical_url' ) ) ); ?>" />
19
  <?php
20
  }
21
+ if(false==ampforwp_get_setting('hide-amp-version-from-source')){
22
+ add_action( 'amp_post_template_head', 'AMPforWP\\AMPVendor\\amp_post_template_add_meta_generator' );
23
+ function amp_post_template_add_meta_generator() {
24
+ ?>
25
+ <meta name="generator" content="AMP for WP <?php echo esc_attr(AMPFORWP_VERSION) ?>" />
26
+ <?php
27
+ }
28
  }
29
 
30
  add_action( 'amp_post_template_head', 'AMPforWP\\AMPVendor\\amp_post_template_add_cached_link' );
includes/vendor/amp/includes/sanitizers/class-amp-allowed-tags-generated.php CHANGED
@@ -791,6 +791,37 @@ class AMP_Allowed_Tags_Generated {
791
  ),
792
  ),
793
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
794
  'amp-date-countdown' => array(
795
  array(
796
  'attr_spec_list' => array(
791
  ),
792
  ),
793
  ),
794
+ 'amp-mowplayer' => array(
795
+ array(
796
+ 'attr_spec_list' => array(
797
+ 'autoplay' => array(),
798
+ 'data-mediaid' => array(
799
+ 'mandatory' => true,
800
+ ),
801
+ 'media' => array(),
802
+ 'noloading' => array(
803
+ 'value' => array(
804
+ '',
805
+ ),
806
+ ),
807
+ ),
808
+ 'tag_spec' => array(
809
+ 'amp_layout' => array(
810
+ 'supported_layouts' => array(
811
+ 6,
812
+ 2,
813
+ 3,
814
+ 7,
815
+ 1,
816
+ 4,
817
+ ),
818
+ ),
819
+ 'requires_extension' => array(
820
+ 'amp-mowplayer',
821
+ ),
822
+ ),
823
+ ),
824
+ ),
825
  'amp-date-countdown' => array(
826
  array(
827
  'attr_spec_list' => array(
includes/vendor/amp/includes/sanitizers/class-amp-gallery-block-sanitizer-5-3.php CHANGED
@@ -282,7 +282,7 @@ class AMP_Gallery_Block_Sanitizer extends AMP_Base_Sanitizer {
282
  if ( 3 != ampforwp_get_setting('ampforwp-gallery-design-type') ) {
283
  $image_div = AMP_DOM_Utils::create_node( $this->dom, 'div', array('class'=>'ampforwp-gallery-item amp-carousel-container') );
284
  $image_div->appendChild($amp_image_node);
285
- if ( isset($image['caption']) ) {
286
  $figure_node = AMP_DOM_Utils::create_node($this->dom, 'figure', array());
287
  $fig_caption = AMP_DOM_Utils::create_node($this->dom, 'figcaption', array('on'=>"tap:AMP.setState({expanded: !expanded})",'tabindex'=>0,'role'=>'button'));
288
  $captionlength = $image['caption']->length;
@@ -338,6 +338,7 @@ class AMP_Gallery_Block_Sanitizer extends AMP_Base_Sanitizer {
338
  foreach ($amp_images as $amp_image) {
339
  $amp_carousel->appendChild( $amp_image );
340
  }
 
341
  }
342
  if ( 2 == ampforwp_get_setting('ampforwp-gallery-design-type') ) {
343
  $button_nodes = array();
@@ -385,6 +386,7 @@ class AMP_Gallery_Block_Sanitizer extends AMP_Base_Sanitizer {
385
  $gal_div->appendChild( $figure_node );
386
  $i++;
387
  }
 
388
  $amp_carousel = $gal_div;
389
  add_action('amp_post_template_css', 'AMPforWP\\AMPVendor\\ampforwp_gal_des_3');
390
  }
@@ -398,6 +400,16 @@ class AMP_Gallery_Block_Sanitizer extends AMP_Base_Sanitizer {
398
  add_action('amp_post_template_css', 'ampforwp_additional_style_carousel_caption');
399
  return $amp_carousel;
400
  }
 
 
 
 
 
 
 
 
 
 
401
  /**
402
  * Get carousel height by containing images.
403
  *
282
  if ( 3 != ampforwp_get_setting('ampforwp-gallery-design-type') ) {
283
  $image_div = AMP_DOM_Utils::create_node( $this->dom, 'div', array('class'=>'ampforwp-gallery-item amp-carousel-container') );
284
  $image_div->appendChild($amp_image_node);
285
+ if ( isset($image['caption']) && is_object($image['caption'])) {
286
  $figure_node = AMP_DOM_Utils::create_node($this->dom, 'figure', array());
287
  $fig_caption = AMP_DOM_Utils::create_node($this->dom, 'figcaption', array('on'=>"tap:AMP.setState({expanded: !expanded})",'tabindex'=>0,'role'=>'button'));
288
  $captionlength = $image['caption']->length;
338
  foreach ($amp_images as $amp_image) {
339
  $amp_carousel->appendChild( $amp_image );
340
  }
341
+ $this->ampforwp_set_block_gallery_caption($node,$node->parentNode);
342
  }
343
  if ( 2 == ampforwp_get_setting('ampforwp-gallery-design-type') ) {
344
  $button_nodes = array();
386
  $gal_div->appendChild( $figure_node );
387
  $i++;
388
  }
389
+ $this->ampforwp_set_block_gallery_caption($node,$gal_div);
390
  $amp_carousel = $gal_div;
391
  add_action('amp_post_template_css', 'AMPforWP\\AMPVendor\\ampforwp_gal_des_3');
392
  }
400
  add_action('amp_post_template_css', 'ampforwp_additional_style_carousel_caption');
401
  return $amp_carousel;
402
  }
403
+ protected function ampforwp_set_block_gallery_caption($node,$append){
404
+ $domData = $this->dom->saveHTML();
405
+ if(preg_match_all('/<figcaption class="blocks-gallery-caption">(.*?)<\/figcaption>/', $domData, $fc)!==false){
406
+ $block_gcnode = AMP_DOM_Utils::create_node($this->dom, 'figcaption', array('class'=>'ampforwp-blocks-gallery-caption') );
407
+ if(isset($fc[1][0])){
408
+ $block_gcnode->nodeValue = $fc[1][0];
409
+ $append->appendChild( $block_gcnode );
410
+ }
411
+ }
412
+ }
413
  /**
414
  * Get carousel height by containing images.
415
  *
pagebuilder/config/moduleTemplate.php CHANGED
@@ -326,7 +326,7 @@ $front_css = '
326
 
327
  @media(max-width:768px){
328
  {{row-class}}.amppb-fluid{width:100%;}
329
- {{row-class}}.amppb-fluid .col, {{row-class}}.amppb-fluid .col-2-wrap{max-width:90%;}
330
  }
331
 
332
  @media(max-width:425px){
326
 
327
  @media(max-width:768px){
328
  {{row-class}}.amppb-fluid{width:100%;}
329
+ {{row-class}}.amppb-fluid .col, {{row-class}}.amppb-fluid .col-2-wrap{max-width:{{fluid-wrapper}};}
330
  }
331
 
332
  @media(max-width:425px){
pagebuilder/inc/admin-amp-page-builder.css CHANGED
@@ -1236,7 +1236,7 @@ Layout css
1236
  -moz-osx-font-smoothing: grayscale;
1237
  }
1238
  /* icons not loading in AMP page builder when WooCommerce Product Slider plugin is Installed */
1239
- [class*=" icon-"]:before {
1240
  font-family: 'icomoon'!important;
1241
  }
1242
  .amppb_accordion__panel {
1236
  -moz-osx-font-smoothing: grayscale;
1237
  }
1238
  /* icons not loading in AMP page builder when WooCommerce Product Slider plugin is Installed */
1239
+ #amp-page-builder [class*=" icon-"]:before {
1240
  font-family: 'icomoon'!important;
1241
  }
1242
  .amppb_accordion__panel {
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.14
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.14 (14th January 2020) =
195
  * Fixed: Warning in accelerated-mobile-pages/includes/options/admin-config.php on line 1250 #4027
196
  * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
@@ -209,7 +222,4 @@ You can contact us from [here](https://ampforwp.com/contact/)
209
  * Fixed: GTM tags are not working in the updated version 1.0.9 but Google Analytics is working,Also in version 1.0.0 both are working fine #4059
210
  * Fixed: Matomo (Piwik) Analytics generating errors in Console. #4042
211
 
212
- = 1.0.12 (12th January 2020) =
213
- * Fixed: Detect Component and add or remove script accordingly #4067
214
-
215
  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.2
7
+ Stable tag: 1.0.15
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.15 (17th January 2020) =
195
+ * Fixed: Sticky Social icons's css not loading correctly on some pages #3980
196
+ * Fixed: Need to add option to hide "AMP version" in view source page(generator). #4000
197
+ * Fixed: Caption of image gallery not displaying #3993
198
+ * Fixed: Need to connect retina image functionality to In-content Related post thumbnails. #4007
199
+ * Fixed: easytoc-icon.png #4041
200
+ * Fixed: AMP links Error. #4016
201
+ * Fixed: Image alignment and Name is not showing AMP #4038
202
+ * Fixed: Need to sanitize amp-mowplayer tag when added in the content. #4044
203
+ * Fixed: Set the priority to high of the icomoon CSS to override every other CSS,in AMP page builder. #4035
204
+ * Fixed: when row Wrapper is set to 100%,static css of max width 90% is getting applied from tablet view mode to below #3999
205
+ * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
206
+
207
  = 1.0.14 (14th January 2020) =
208
  * Fixed: Warning in accelerated-mobile-pages/includes/options/admin-config.php on line 1250 #4027
209
  * Fixed: Code improvement in Detect Component and add or remove script accordingly #4067
222
  * Fixed: GTM tags are not working in the updated version 1.0.9 but Google Analytics is working,Also in version 1.0.0 both are working fine #4059
223
  * Fixed: Matomo (Piwik) Analytics generating errors in Console. #4042
224
 
 
 
 
225
  Full changelog available [ at changelog.txt](https://plugins.svn.wordpress.org/accelerated-mobile-pages/trunk/changelog.txt)
templates/design-manager/design-1/style.php CHANGED
@@ -112,7 +112,7 @@ if(count($matches)==0){
112
  .clearfix, .cb{clear:both}
113
  .alignright{ float: right; }
114
  .alignleft{ float: left; }
115
- .aligncenter{ display: block; margin-left: auto; margin-right: auto; max-width: 100% }
116
  .amp-wp-enforced-sizes{ max-width: 100%; margin: 0 auto; }
117
  .amp-wp-unknown-size img{ object-fit: contain; }
118
  amp-iframe{ max-width: 100%; margin-bottom : 20px; }
112
  .clearfix, .cb{clear:both}
113
  .alignright{ float: right; }
114
  .alignleft{ float: left; }
115
+ .aligncenter{ display: block; margin-left: auto; margin-right: auto; max-width: 100%;text-align:center; }
116
  .amp-wp-enforced-sizes{ max-width: 100%; margin: 0 auto; }
117
  .amp-wp-unknown-size img{ object-fit: contain; }
118
  amp-iframe{ max-width: 100%; margin-bottom : 20px; }
templates/design-manager/design-2/style.php CHANGED
@@ -828,4 +828,7 @@ if(true == ampforwp_get_setting('ampforwp-single-related-posts-excerpt')){?>
828
  top: 0px;
829
  right: 0;
830
  cursor:pointer;
 
 
 
831
  }
828
  top: 0px;
829
  right: 0;
830
  cursor:pointer;
831
+ }
832
+ .ampforwp-blocks-gallery-caption{
833
+ font-size: 16px;
834
  }
templates/design-manager/design-3/style.php CHANGED
@@ -1069,4 +1069,7 @@ if(true == ampforwp_get_setting('ampforwp-single-related-posts-excerpt')){?>
1069
  top: 0px;
1070
  right: 0;
1071
  cursor:pointer;
 
 
 
1072
  }
1069
  top: 0px;
1070
  right: 0;
1071
  cursor:pointer;
1072
+ }
1073
+ .ampforwp-blocks-gallery-caption{
1074
+ font-size: 16px;
1075
  }
templates/design-manager/swift/single.php CHANGED
@@ -116,7 +116,16 @@ global $redux_builder_amp; ?>
116
  <li class="<?php if ( has_post_thumbnail() ) { echo'has_thumbnail'; } else { echo 'no_thumbnail'; } ?>">
117
  <?php if ( true == $redux_builder_amp['ampforwp-single-related-posts-image'] ) { if(ampforwp_has_post_thumbnail()){?>
118
  <div class="rlp-image">
119
- <?php ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>220,'image_crop_height'=>134) );?>
 
 
 
 
 
 
 
 
 
120
  </div>
121
  <?php } } ?>
122
  <div class="rlp-cnt">
@@ -159,7 +168,15 @@ do_action("ampforwp_single_design_type_handle_d1");
159
  <li class="<?php if ( has_post_thumbnail() ) { echo'has_thumbnail'; } else { echo 'no_thumbnail'; } ?>">
160
  <?php if ( true == $redux_builder_amp['ampforwp-single-related-posts-image'] ) { if(ampforwp_has_post_thumbnail()){?>
161
  <div class="rlp-image">
162
- <?php ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>220,'image_crop_height'=>134) );?>
 
 
 
 
 
 
 
 
163
  </div>
164
  <?php } } ?>
165
  <div class="rlp-cnt">
@@ -196,7 +213,15 @@ do_action("ampforwp_single_design_type_handle_d1");
196
  <div class="rp-slide">
197
  <?php if ( true == ampforwp_get_setting('ampforwp-single-related-posts-image') ) { if(ampforwp_has_post_thumbnail()){?>
198
  <div class="rlp-image">
199
- <?php ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>346,'image_crop_height'=>188) );?>
 
 
 
 
 
 
 
 
200
  </div>
201
  <?php } } ?>
202
  <div class="rlp-cnt">
@@ -350,7 +375,15 @@ do_action("ampforwp_single_design_type_handle_d1");
350
  <li class="<?php if ( has_post_thumbnail() ) { echo'has_thumbnail'; } else { echo 'no_thumbnail'; } ?>">
351
  <?php if ( true == $redux_builder_amp['ampforwp-single-related-posts-image'] ) { ?>
352
  <div class="rlp-image">
353
- <?php ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>346,'image_crop_height'=>188) );?>
 
 
 
 
 
 
 
 
354
  </div>
355
  <?php } ?>
356
  <div class="rlp-cnt">
116
  <li class="<?php if ( has_post_thumbnail() ) { echo'has_thumbnail'; } else { echo 'no_thumbnail'; } ?>">
117
  <?php if ( true == $redux_builder_amp['ampforwp-single-related-posts-image'] ) { if(ampforwp_has_post_thumbnail()){?>
118
  <div class="rlp-image">
119
+ <?php
120
+ $r_width = 220;
121
+ $r_height = 134;
122
+ if(function_exists('ampforwp_get_retina_image_settings')){
123
+ $ret_config = ampforwp_get_retina_image_settings($r_width,$r_height);
124
+ $r_width = intval($ret_config['width']);
125
+ $r_height = intval($ret_config['height']);
126
+ }
127
+ ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>esc_attr($r_width),'image_crop_height'=>esc_attr($r_height)) );
128
+ ?>
129
  </div>
130
  <?php } } ?>
131
  <div class="rlp-cnt">
168
  <li class="<?php if ( has_post_thumbnail() ) { echo'has_thumbnail'; } else { echo 'no_thumbnail'; } ?>">
169
  <?php if ( true == $redux_builder_amp['ampforwp-single-related-posts-image'] ) { if(ampforwp_has_post_thumbnail()){?>
170
  <div class="rlp-image">
171
+ <?php
172
+ $r_width = 220;
173
+ $r_height = 134;
174
+ if(function_exists('ampforwp_get_retina_image_settings')){
175
+ $ret_config = ampforwp_get_retina_image_settings($r_width,$r_height);
176
+ $r_width = intval($ret_config['width']);
177
+ $r_height = intval($ret_config['height']);
178
+ }
179
+ ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>esc_attr($r_width),'image_crop_height'=>esc_attr($r_height)) );?>
180
  </div>
181
  <?php } } ?>
182
  <div class="rlp-cnt">
213
  <div class="rp-slide">
214
  <?php if ( true == ampforwp_get_setting('ampforwp-single-related-posts-image') ) { if(ampforwp_has_post_thumbnail()){?>
215
  <div class="rlp-image">
216
+ <?php
217
+ $r_width = 346;
218
+ $r_height = 188;
219
+ if(function_exists('ampforwp_get_retina_image_settings')){
220
+ $ret_config = ampforwp_get_retina_image_settings($r_width,$r_height);
221
+ $r_width = intval($ret_config['width']);
222
+ $r_height = intval($ret_config['height']);
223
+ }
224
+ ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>esc_attr($r_width),'image_crop_height'=>esc_attr($r_height)) );?>
225
  </div>
226
  <?php } } ?>
227
  <div class="rlp-cnt">
375
  <li class="<?php if ( has_post_thumbnail() ) { echo'has_thumbnail'; } else { echo 'no_thumbnail'; } ?>">
376
  <?php if ( true == $redux_builder_amp['ampforwp-single-related-posts-image'] ) { ?>
377
  <div class="rlp-image">
378
+ <?php
379
+ $r_width = 346;
380
+ $r_height = 188;
381
+ if(function_exists('ampforwp_get_retina_image_settings')){
382
+ $ret_config = ampforwp_get_retina_image_settings($r_width,$r_height);
383
+ $r_width = intval($ret_config['width']);
384
+ $r_height = intval($ret_config['height']);
385
+ }
386
+ ampforwp_get_relatedpost_image('full',array('image_crop'=>'true','image_crop_width'=>esc_attr($r_width),'image_crop_height'=>esc_attr($r_height)) );?>
387
  </div>
388
  <?php } ?>
389
  <div class="rlp-cnt">
templates/design-manager/swift/style.php CHANGED
@@ -83,7 +83,7 @@ html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,abbr,address
83
  box-sizing: border-box;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;-ms-box-sizing: border-box;-o-box-sizing: border-box;}
84
  .alignright {float: right;margin-left:10px;}
85
  .alignleft {float: left;margin-right:10px;}
86
- .aligncenter {display: block;margin-left: auto;margin-right: auto;}
87
  amp-iframe { max-width: 100%; margin-bottom : 20px; }
88
  amp-wistia-player {margin:5px 0px;}
89
  .wp-caption {padding: 0;}
@@ -1921,7 +1921,7 @@ if ( $ampforwp_font_icon == 'fontawesome-icons' ){ ?>
1921
  <?php if ( true == ampforwp_get_setting('enable-single-flipboard-share') ) {?>
1922
  .s_fd{background:#f52828}
1923
  <?php } ?>
1924
- <?php if( ampforwp_get_setting('enable-single-social-icons') ){ ?>
1925
  .s_stk{background: #f1f1f1;display:inline-block;width: 100%;padding:0;position:fixed;bottom: 0;text-align: center;border: 0;}
1926
  .s_stk ul{width:100%;display:inline-flex;}
1927
  .s_stk ul li{flex-direction: column;flex-basis: 0;flex: 1 0 5%;max-width: calc(100% - 10px);display: flex;height:40px}
@@ -2278,6 +2278,20 @@ if(ampforwp_get_setting('ampforwp-gallery-design-type')==3){?>
2278
  .amp-carousel-containerd3 figcaption {
2279
  max-width: 150px;
2280
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2281
  <?php } ?>
2282
  .m-s-i li a.s_telegram{
2283
  background: #d0d0d0;
83
  box-sizing: border-box;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;-ms-box-sizing: border-box;-o-box-sizing: border-box;}
84
  .alignright {float: right;margin-left:10px;}
85
  .alignleft {float: left;margin-right:10px;}
86
+ .aligncenter {display: block;margin-left: auto;margin-right: auto;text-align: center;}
87
  amp-iframe { max-width: 100%; margin-bottom : 20px; }
88
  amp-wistia-player {margin:5px 0px;}
89
  .wp-caption {padding: 0;}
1921
  <?php if ( true == ampforwp_get_setting('enable-single-flipboard-share') ) {?>
1922
  .s_fd{background:#f52828}
1923
  <?php } ?>
1924
+ <?php if( ampforwp_get_setting('enable-single-social-icons') || (is_page() && ampforwp_get_setting('ampforwp-page-sticky-social')) ){ ?>
1925
  .s_stk{background: #f1f1f1;display:inline-block;width: 100%;padding:0;position:fixed;bottom: 0;text-align: center;border: 0;}
1926
  .s_stk ul{width:100%;display:inline-flex;}
1927
  .s_stk ul li{flex-direction: column;flex-basis: 0;flex: 1 0 5%;max-width: calc(100% - 10px);display: flex;height:40px}
2278
  .amp-carousel-containerd3 figcaption {
2279
  max-width: 150px;
2280
  }
2281
+ .ampforwp-blocks-gallery-caption{
2282
+ float: left;
2283
+ width: 100%;
2284
+ font-size: 16px;
2285
+ }
2286
+ <?php }else if(ampforwp_get_setting('ampforwp-gallery-design-type')==2){?>
2287
+ .ampforwp-blocks-gallery-caption{
2288
+ font-size: 16px;
2289
+ margin-top: -23px;
2290
+ }
2291
+ <?php }else if(ampforwp_get_setting('ampforwp-gallery-design-type')==1){?>
2292
+ .ampforwp-blocks-gallery-caption{
2293
+ font-size: 16px;
2294
+ }
2295
  <?php } ?>
2296
  .m-s-i li a.s_telegram{
2297
  background: #d0d0d0;
templates/features.php CHANGED
@@ -397,7 +397,9 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
397
 
398
  if ( $amp_url ) {
399
  printf('<link rel="amphtml" href="%s" />', esc_url($amp_url));
400
- printf('<meta name="generator" content="%s %s"/>', esc_html__('AMP for WP'), esc_attr(AMPFORWP_VERSION) );
 
 
401
  }
402
 
403
  } //end of ampforwp_home_archive_rel_canonical()
@@ -2963,6 +2965,13 @@ function ampforwp_auto_add_amp_in_menu_link( $atts, $item, $args ) {
2963
  if($item->type=='taxonomy' && !in_array($item->object, ampforwp_get_all_post_types()) ){
2964
  return $atts;
2965
  }
 
 
 
 
 
 
 
2966
  if(ampforwp_get_setting('amp-core-end-point') == 1 ){
2967
  $atts['href'] = user_trailingslashit(trailingslashit( $atts['href'] ) );
2968
  $atts['href'] = add_query_arg(AMPFORWP_AMP_QUERY_VAR,'1', $atts['href']);
@@ -4476,26 +4485,28 @@ function ampforwp_get_featured_image_from_content( $featured_image = "", $size="
4476
  }
4477
  if($output==0){
4478
  if(preg_match('/<figure\sclass="(.*?)">(<img\ssrc="(.*?)"(.*?)>)<\/figure>/', $post->post_content, $fm)){
4479
- preg_match('/<figure\sclass="(.*?)">(<img\ssrc="(.*?)"(.*?)>)<\/figure>/', $post->post_content, $fb);
4480
- if(isset( $fb[2])){
4481
  $dom = new DOMDocument();
4482
- $image_html = $fb[2];
4483
- $dom->loadHTML($image_html);
4484
- $x = new DOMXPath($dom);
4485
- foreach($x->query("//img") as $node){
4486
- $node->setAttribute("width","1366");
4487
- $node->setAttribute("height","600");
4488
- }
4489
- $image_html = $dom->saveHtml();
4490
- preg_match_all('/<img\ssrc="(.*?)">/', $image_html, $fimg);
4491
- if(isset($fimg[0][0])){
4492
- $image_html ='<figure class="'.esc_attr($fb[1]).'">'.$fimg[0][0].'</figure>';
4493
- if(isset($fb[3])){
4494
- $image_url = $fb[3];
4495
- $image_width = 1366;
4496
- $image_height = 600;
4497
- }
4498
- }
 
 
 
4499
  }
4500
  }
4501
  }
@@ -4661,11 +4672,25 @@ function ampforwp_inline_related_posts(){
4661
 
4662
  if ( ampforwp_has_post_thumbnail() ) {
4663
  if( 4 == $redux_builder_amp['amp-design-selector'] ){
4664
- $thumb_url_2 = ampforwp_aq_resize( $thumb_url_2, 220 , 134 , true, false, true );
 
 
 
 
 
 
 
4665
  $inline_related_posts_img = '<amp-img src="'.esc_url( $thumb_url_2[0] ).'" width="' . esc_attr($thumb_url_2[1]) . '" height="' . esc_attr($thumb_url_2[2]) . '" layout="responsive"></amp-img>';
4666
  }
4667
  else{
4668
- $thumb_url_2 = ampforwp_aq_resize( $thumb_url_2, 150 , 150 , true, false,true );
 
 
 
 
 
 
 
4669
  $thumb_url = $thumb_url_2[0];
4670
  $thumb_width = $thumb_url_2[1];
4671
  $thumb_height = $thumb_url_2[2];
@@ -6842,14 +6867,16 @@ function ampforwp_post_template_data( $data ) {
6842
  return $data;
6843
  }
6844
 
6845
- add_action('amp_meta','ampforwp_generator');
6846
- if ( ! function_exists('ampforwp_generator') ) {
6847
- function ampforwp_generator(){
6848
- if(true == ampforwp_get_setting('ampforwp-amp-convert-to-wp')){
6849
- ?>
6850
- <meta name="generator" content="AMP for WP <?php echo esc_attr(AMPFORWP_VERSION)?>" />
6851
- <?php }
6852
- }
 
 
6853
  }
6854
 
6855
  // #2497 Ivory Search Compatibility Added
@@ -7622,9 +7649,7 @@ if(!function_exists('ampforwp_transposh_plugin_rtl_css')){
7622
 
7623
  add_filter('ampforwp_the_content_last_filter','ampforwp_include_required_scripts',12);
7624
  function ampforwp_include_required_scripts($content){
7625
-
7626
  $comp_to_remove_arr = array();
7627
-
7628
  preg_match_all('/<\/amp-(.*?)>/', $content, $matches);
7629
  if(isset($matches[1][0])){
7630
  $amp_comp = $matches[1];
@@ -7671,7 +7696,7 @@ function ampforwp_include_required_scripts($content){
7671
  }
7672
  $comp_to_include_arr = apply_filters('ampforwp_amp_custom_element_to_include',$comp_to_include_arr);
7673
  if(in_array($comp, $comp_to_include_arr)){
7674
- if(!preg_match('/<script\scustom-element=\"amp-'.esc_attr($comp).'\"(.*?)><\/script>/', $content, $matches)){
7675
  $script_tag = '<head><script custom-element="amp-'.esc_attr($comp).'" src="'.esc_url($comp_url).'" async></script>';
7676
  $content = str_replace('<head>', $script_tag, $content);
7677
  }
@@ -7680,17 +7705,17 @@ function ampforwp_include_required_scripts($content){
7680
  }
7681
  }
7682
 
7683
- preg_match_all('/<script\scustom-element="(.*?)"(.*?)><\/script>/', $content, $matches);
7684
  if(isset($matches[0])){
7685
- if(isset($matches[1])){
7686
  $excl_arr = array('amp-form','amp-bind','amp-access','amp-analytics','amp-access-laterpay','amp-access-poool','amp-dynamic-css-classes','amp-fx-collection','amp-inputmask','amp-lightbox-gallery','amp-inputmask','amp-mustache','amp-subscriptions-google','amp-subscriptions','amp-video-docking','amp-story');
7687
  $inc_elem_arr = array();
7688
  for($r=0;$r<count($comp_to_remove_arr);$r++){
7689
  $inc_elem_arr[] = 'amp-'.$comp_to_remove_arr[$r];
7690
  }
7691
- for($i=0;$i<count($matches[1]);$i++){
7692
- if(isset($matches[1][$i])){
7693
- $component = $matches[1][$i];
7694
  if(!in_array($component,$excl_arr)){
7695
  if(!preg_match("/<\/$component>/", $content) && !$is_script){
7696
  $remove_comp = $matches[0][$i];
@@ -7698,7 +7723,7 @@ function ampforwp_include_required_scripts($content){
7698
  }else if(in_array($component, $inc_elem_arr )){
7699
  for($rc=0;$rc<count($inc_elem_arr);$rc++){
7700
  $rcomp = $inc_elem_arr[$rc];
7701
- if(preg_match('/<script\scustom-element="'.$rcomp.'"(.*?)<\/script>/', $content,$rmc)){
7702
  if(isset($rmc[0])){
7703
  $remove_comp = $rmc[0];
7704
  $content = str_replace($remove_comp, '', $content);
@@ -7707,9 +7732,31 @@ function ampforwp_include_required_scripts($content){
7707
  }
7708
  }
7709
  }
 
 
 
 
 
7710
  }
7711
  }
7712
  }
7713
  }
7714
  return $content;
7715
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
397
 
398
  if ( $amp_url ) {
399
  printf('<link rel="amphtml" href="%s" />', esc_url($amp_url));
400
+ if(false==ampforwp_get_setting('hide-amp-version-from-source')){
401
+ printf('<meta name="generator" content="%s %s"/>', esc_html__('AMP for WP'), esc_attr(AMPFORWP_VERSION) );
402
+ }
403
  }
404
 
405
  } //end of ampforwp_home_archive_rel_canonical()
2965
  if($item->type=='taxonomy' && !in_array($item->object, ampforwp_get_all_post_types()) ){
2966
  return $atts;
2967
  }
2968
+ $url = $atts['href'];
2969
+ if($url){
2970
+ $is_external = ampforwp_isexternal($url);
2971
+ }
2972
+ if($is_external){
2973
+ return $atts;
2974
+ }
2975
  if(ampforwp_get_setting('amp-core-end-point') == 1 ){
2976
  $atts['href'] = user_trailingslashit(trailingslashit( $atts['href'] ) );
2977
  $atts['href'] = add_query_arg(AMPFORWP_AMP_QUERY_VAR,'1', $atts['href']);
4485
  }
4486
  if($output==0){
4487
  if(preg_match('/<figure\sclass="(.*?)">(<img\ssrc="(.*?)"(.*?)>)<\/figure>/', $post->post_content, $fm)){
4488
+ if(isset( $fm[2])){
 
4489
  $dom = new DOMDocument();
4490
+ preg_match('/<img\ssrc="(.*?)"(.*?)>/', $fm[2],$fmatch);
4491
+ if(isset($fmatch[0])){
4492
+ $image_html = $fmatch[0];
4493
+ $dom->loadHTML($image_html);
4494
+ $x = new DOMXPath($dom);
4495
+ foreach($x->query("//img") as $node){
4496
+ $node->setAttribute("width","1366");
4497
+ $node->setAttribute("height","600");
4498
+ }
4499
+ $image_html = $dom->saveHtml();
4500
+ preg_match_all('/<img\ssrc="(.*?)">/', $image_html, $fimg);
4501
+ if(isset($fimg[0][0])){
4502
+ $image_html ='<figure class="'.esc_attr($fm[1]).'">'.$fimg[0][0].'</figure>';
4503
+ if(isset($fmatch[1])){
4504
+ $image_url = $fmatch[1];
4505
+ $image_width = 1366;
4506
+ $image_height = 600;
4507
+ }
4508
+ }
4509
+ }
4510
  }
4511
  }
4512
  }
4672
 
4673
  if ( ampforwp_has_post_thumbnail() ) {
4674
  if( 4 == $redux_builder_amp['amp-design-selector'] ){
4675
+ $r_width = 220;
4676
+ $r_height = 134;
4677
+ if(function_exists('ampforwp_get_retina_image_settings')){
4678
+ $ret_config = ampforwp_get_retina_image_settings($r_width,$r_height);
4679
+ $r_width = intval($ret_config['width']);
4680
+ $r_height = intval($ret_config['height']);
4681
+ }
4682
+ $thumb_url_2 = ampforwp_aq_resize( $thumb_url_2, $r_width , $r_height , true, false, true );
4683
  $inline_related_posts_img = '<amp-img src="'.esc_url( $thumb_url_2[0] ).'" width="' . esc_attr($thumb_url_2[1]) . '" height="' . esc_attr($thumb_url_2[2]) . '" layout="responsive"></amp-img>';
4684
  }
4685
  else{
4686
+ $r_width = 150;
4687
+ $r_height = 150;
4688
+ if(function_exists('ampforwp_get_retina_image_settings')){
4689
+ $ret_config = ampforwp_get_retina_image_settings($r_width,$r_height);
4690
+ $r_width = intval($ret_config['width']);
4691
+ $r_height = intval($ret_config['height']);
4692
+ }
4693
+ $thumb_url_2 = ampforwp_aq_resize( $thumb_url_2, $r_width , $r_height , true, false,true );
4694
  $thumb_url = $thumb_url_2[0];
4695
  $thumb_width = $thumb_url_2[1];
4696
  $thumb_height = $thumb_url_2[2];
6867
  return $data;
6868
  }
6869
 
6870
+ if(false==ampforwp_get_setting('hide-amp-version-from-source')){
6871
+ add_action('amp_meta','ampforwp_generator');
6872
+ if ( ! function_exists('ampforwp_generator') ) {
6873
+ function ampforwp_generator(){
6874
+ if(true == ampforwp_get_setting('ampforwp-amp-convert-to-wp')){
6875
+ ?>
6876
+ <meta name="generator" content="AMP for WP <?php echo esc_attr(AMPFORWP_VERSION)?>" />
6877
+ <?php }
6878
+ }
6879
+ }
6880
  }
6881
 
6882
  // #2497 Ivory Search Compatibility Added
7649
 
7650
  add_filter('ampforwp_the_content_last_filter','ampforwp_include_required_scripts',12);
7651
  function ampforwp_include_required_scripts($content){
 
7652
  $comp_to_remove_arr = array();
 
7653
  preg_match_all('/<\/amp-(.*?)>/', $content, $matches);
7654
  if(isset($matches[1][0])){
7655
  $amp_comp = $matches[1];
7696
  }
7697
  $comp_to_include_arr = apply_filters('ampforwp_amp_custom_element_to_include',$comp_to_include_arr);
7698
  if(in_array($comp, $comp_to_include_arr)){
7699
+ if(!preg_match('/<script(\s|\sasync\s)custom-element="amp-'.esc_attr($comp).'"(.*?)>(.*?)<\/script>/s', $content, $matches)){
7700
  $script_tag = '<head><script custom-element="amp-'.esc_attr($comp).'" src="'.esc_url($comp_url).'" async></script>';
7701
  $content = str_replace('<head>', $script_tag, $content);
7702
  }
7705
  }
7706
  }
7707
 
7708
+ preg_match_all('/<script(\s|\sasync\s)custom-element="(.*?)"(.*?)>(.*?)<\/script>/s', $content, $matches);
7709
  if(isset($matches[0])){
7710
+ if(isset($matches[2])){
7711
  $excl_arr = array('amp-form','amp-bind','amp-access','amp-analytics','amp-access-laterpay','amp-access-poool','amp-dynamic-css-classes','amp-fx-collection','amp-inputmask','amp-lightbox-gallery','amp-inputmask','amp-mustache','amp-subscriptions-google','amp-subscriptions','amp-video-docking','amp-story');
7712
  $inc_elem_arr = array();
7713
  for($r=0;$r<count($comp_to_remove_arr);$r++){
7714
  $inc_elem_arr[] = 'amp-'.$comp_to_remove_arr[$r];
7715
  }
7716
+ for($i=0;$i<count($matches[2]);$i++){
7717
+ if(isset($matches[2][$i])){
7718
+ $component = $matches[2][$i];
7719
  if(!in_array($component,$excl_arr)){
7720
  if(!preg_match("/<\/$component>/", $content) && !$is_script){
7721
  $remove_comp = $matches[0][$i];
7723
  }else if(in_array($component, $inc_elem_arr )){
7724
  for($rc=0;$rc<count($inc_elem_arr);$rc++){
7725
  $rcomp = $inc_elem_arr[$rc];
7726
+ if(preg_match('/<script(\s|\sasync\s)custom-element="'.esc_attr($rcomp).'"(.*?)>(.*?)<\/script>/s', $content,$rmc)){
7727
  if(isset($rmc[0])){
7728
  $remove_comp = $rmc[0];
7729
  $content = str_replace($remove_comp, '', $content);
7732
  }
7733
  }
7734
  }
7735
+ // REMOVING DUPLICATE SCRIPT.
7736
+ $count_elem = array_count_values($matches[2])[$component];
7737
+ if($count_elem>1){
7738
+ $content = preg_replace('/<script(\s|\sasync\s)custom-element="'.esc_attr($component).'"(.*?)>(.*?)<\/script>/s','',$content,1,$matches[2][$i]);
7739
+ }
7740
  }
7741
  }
7742
  }
7743
  }
7744
  return $content;
7745
+ }
7746
+ if(!function_exists('ampforwp_get_retina_image_settings')){
7747
+ function ampforwp_get_retina_image_settings($width,$height){
7748
+ $data['width'] = intval($width);
7749
+ $data['height'] = intval($height);
7750
+ if ( 1 == ampforwp_get_setting('ampforwp-retina-images') ) {
7751
+ $resolution = 2;
7752
+ if (ampforwp_get_setting('ampforwp-retina-images-res')) {
7753
+ $resolution = ampforwp_get_setting('ampforwp-retina-images-res');
7754
+ }
7755
+ $width = $width * $resolution;
7756
+ $height = $height * $resolution;
7757
+ $data['width'] = intval($width);
7758
+ $data['height'] = intval($height);
7759
+ }
7760
+ return $data;
7761
+ }
7762
+ }