AMP for WP – Accelerated Mobile Pages

Version Description

(23th August 2017) = * Design 3 Images were not aligned properly. Fixed. #1040 * Caption in the design 3 improved * Jetpack File not loading throwing fatal error #1038 * If the mobile redirection is ON and the category is excluded to display the AMP then it should redirect properly * Custom Editor Compatibility issue with SiteOrigin PageBuilder fixed #997 * Native Twitter Embed support * Added a hook after the body tag: ampforwp_body_beginning (commit) * GTM in AMP Improved #958 * WP User Avatar compatibility Added #975 * Alt tag on frontpage featured image added #1050 * Blurred Images on the frontpage fixed #1050 * Need to escape alt tag #1049 * Debug errors & PHP warnings were fixed #859 #811 #830 #810 * Proper rel canonicals for inner pages #1047 * Added Video sanitizer for comments #1053 * When activating the AMP plugin, display a notification in the popup. #1036 * Video Sanitizer added for Comments

Download this release

Release Info

Developer	mohammed_kaludi
Plugin	AMP for WP – Accelerated Mobile Pages
Version	0.9.59
Comparing to
See all releases

Code changes from version 0.9.58.1 to 0.9.59

Files changed (35) hide show

accelerated-moblie-pages.php +81 -4
images/gf.png +0 -0
includes/admin-style.css +3 -0
includes/includes.php +1 -1
includes/options/admin-config.php +56 -1
includes/redirect.php +2 -2
readme.txt +23 -2
templates/design-manager/design-1/archive.php +1 -1
templates/design-manager/design-1/elements/comments.php +2 -1
templates/design-manager/design-1/elements/meta-taxonomy.php +6 -2
templates/design-manager/design-1/frontpage.php +1 -0
templates/design-manager/design-1/index.php +1 -1
templates/design-manager/design-1/search.php +1 -1
templates/design-manager/design-1/single.php +1 -1
templates/design-manager/design-1/style.php +3 -0
templates/design-manager/design-2/archive.php +1 -0
templates/design-manager/design-2/elements/comments.php +2 -1
templates/design-manager/design-2/elements/meta-taxonomy.php +6 -2
templates/design-manager/design-2/frontpage.php +1 -0
templates/design-manager/design-2/index.php +1 -0
templates/design-manager/design-2/search.php +1 -0
templates/design-manager/design-2/single.php +1 -0
templates/design-manager/design-2/style.php +4 -0
templates/design-manager/design-3/archive.php +1 -0
templates/design-manager/design-3/elements/comments.php +2 -1
templates/design-manager/design-3/elements/meta-taxonomy.php +6 -2
templates/design-manager/design-3/frontpage.php +1 -1
templates/design-manager/design-3/index.php +1 -0
templates/design-manager/design-3/search.php +1 -0
templates/design-manager/design-3/single.php +1 -0
templates/design-manager/design-3/style.php +8 -12
templates/features.php +74 -58
templates/frontpage-elements.php +33 -8
templates/report-bugs.php +1 -1
templates/search-functions.php +1 -1

accelerated-moblie-pages.php CHANGED Viewed

@@ -3,7 +3,7 @@
             Plugin Name: Accelerated Mobile Pages
             Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
             Description: AMP for WP - Accelerated Mobile Pages for WordPress
-            -
            Version: 0.9.58.1
             Author: Ahmed Kaludi, Mohammed Kaludi
             Author URI: https://ampforwp.com/
             Donate link: https://www.paypal.me/Kaludi/25
@@ -18,7 +18,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
             define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.php');
             define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
             define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
-            -
            define('AMPFORWP_VERSION','0.9.58.1');
             // any changes to AMP_QUERY_VAR should be refelected here
             define('AMPFORWP_AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
@@ -27,7 +27,7 @@ load_plugin_textdomain( 'accelerated-mobile-pages', false, trailingslashit(AMPFO
             // Rewrite the Endpoints after the plugin is activate, as priority is set to 11
             function ampforwp_add_custom_post_support() {
             	global $redux_builder_amp;
-            -
            	if( $redux_builder_amp['amp-on-off-for-all-pages'] ) {
             		add_rewrite_endpoint( AMPFORWP_AMP_QUERY_VAR, EP_PAGES | EP_PERMALINK | EP_AUTHORS  | EP_ALL_ARCHIVES |  EP_ROOT );
             		add_post_type_support( 'page', AMPFORWP_AMP_QUERY_VAR );
+            	}
@@ -36,6 +36,7 @@ add_action( 'init', 'ampforwp_add_custom_post_support',11);
             // Frontpage and Blog page check from reading settings.
             function ampforwp_name_blog_page() {
             	$page_for_posts  =  get_option( 'page_for_posts' );
             	$post = get_post($page_for_posts);
             	if ( $post ) {
@@ -231,7 +232,7 @@ add_action('after_setup_theme','ampforwp_add_module_files');
             function ampforwp_add_module_files() {
             	global $redux_builder_amp;
-            -
            	if ( $redux_builder_amp['ampforwp-content-builder'] ) {
             		if ( ! function_exists( 'bstw' ) ) {
             			require_once AMPFORWP_PLUGIN_DIR .'/includes/vendor/tinymce-widget/tinymce-widget.php';
+            		}
@@ -476,4 +477,80 @@ if ( ! function_exists('ampforwp_init') ) {
             			require_once( AMP__DIR__ . '/jetpack-helper.php' );
+            		}
+            	}
+            }


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.59
7	Author: Ahmed Kaludi, Mohammed Kaludi
8	Author URI: https://ampforwp.com/
9	Donate link: https://www.paypal.me/Kaludi/25

18	define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.php');
19	define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
20	define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
21	+ define('AMPFORWP_VERSION','0.9.59');
22	// any changes to AMP_QUERY_VAR should be refelected here
23	define('AMPFORWP_AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
24

27	// Rewrite the Endpoints after the plugin is activate, as priority is set to 11
28	function ampforwp_add_custom_post_support() {
29	global $redux_builder_amp;
30	+ if( isset($redux_builder_amp['amp-on-off-for-all-pages']) && $redux_builder_amp['amp-on-off-for-all-pages'] ) {
31	add_rewrite_endpoint( AMPFORWP_AMP_QUERY_VAR, EP_PAGES \| EP_PERMALINK \| EP_AUTHORS \| EP_ALL_ARCHIVES \| EP_ROOT );
32	add_post_type_support( 'page', AMPFORWP_AMP_QUERY_VAR );
33	}

36
37	// Frontpage and Blog page check from reading settings.
38	function ampforwp_name_blog_page() {
39	+ if(!$page_for_posts = get_option('page_for_posts')) return;
40	$page_for_posts = get_option( 'page_for_posts' );
41	$post = get_post($page_for_posts);
42	if ( $post ) {

232	function ampforwp_add_module_files() {
233
234	global $redux_builder_amp;
235	+ if ( isset($redux_builder_amp['ampforwp-content-builder']) && $redux_builder_amp['ampforwp-content-builder'] ) {
236	if ( ! function_exists( 'bstw' ) ) {
237	require_once AMPFORWP_PLUGIN_DIR .'/includes/vendor/tinymce-widget/tinymce-widget.php';
238	}

477	require_once( AMP__DIR__ . '/jetpack-helper.php' );
478	}
479	}
480	+ }
481	+
482	+
483	+ function AMP_update_db_check() {
484	+ $ampforWPCurrentVersion = AMPFORWP_VERSION;
485	+ if (get_option( 'AMPforwp_db_version' ) != $ampforWPCurrentVersion) {
486	+
487	+ if ( isset( $_GET['ampforwp-dismiss'] ) && trim($_GET['ampforwp-dismiss'])=="ampforwp_dismiss_admin_notices" ) {
488	+ update_option( 'AMPforwp_db_version', $ampforWPCurrentVersion );
489	+ wp_redirect(admin_url('/index.php'), 301);
490	+ }
491	+
492	+ add_action('admin_notices', 'ampforwp_update_notice');
493	+ }
494	+ }
495	+ add_action( 'plugins_loaded', 'AMP_update_db_check' );
496	+
497	+ function ampforwp_update_notice() {
498	+ $ampforWPCurrentVersion = AMPFORWP_VERSION;
499	+ ?>
500	+ <div class="notice-success notice is-dismissible amp-update-notice" style=" display: table;
501	+ position: relative;
502	+ height: 70px;
503	+ padding: 0;
504	+ border: 0;
505	+ overflow: hidden;
506	+ margin-bottom: 10px;
507	+ " id="gf_dashboard_message">
508	+ <div style=" padding: 15px 15px 10px 15px;
509	+ display: inline-block;">
510	+ <img style=" width: 40px;
511	+ display: inline;
512	+ height: 40px;" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAn1BMVEUAAADuHCXwHiTuHSTtHST/IjjuHSXuHCTvHSXvHCXwHi3/JyfuHSTuHCTvHSTvHCTxHSb/NDTyHyj0IyruHSTvHSXvHSbuHST1ICftHCXuHCXuHSXwHiXvHyfuHSTuHSTvHSXuHCTuHCTuHCTuHCTvHSXyHibuHCTuHCXuHCXuHCXuHibwICjuHCTuHCTuHSTwHSbuHCXuHCTuHCTtHCSisK2PAAAANHRSTlMA+1T35wiIxm9kEQzu4Yx/NgQlFZV6PrAa16RpUi7MhE3y3LmYXynrz5FYSSC9q55EddGypVN9ggAABlxJREFUeNrVm+mymkAQhQfZBVQEFNz3fbtm3v/ZYqUqyWww0603Vfn+mcr1wMz06QUk/yfZIPRua79KYst2Vgd/fS9aU5f8E6JFx4+pktWPryn5VtKH51u0kXgY9Mk30cv31IhZkH1e/VJU1BzrR+uzJ2I6sigQ5yv63NoPKYa42/6M/JpiWXrvr0I7p+/gnN7U3+7pm1x3BM/Op+9je+iACO2mI+aPcq8ItmHQ7WyGVVOUHHDWFI1qN3Y0HmSiSfYX3atddxhPmNCv1As6HNdvqvuYP6mSDXgbTsq78cdt7YV3HOU2lDD9QBnVZnuZnlXOkYAOwlzjaxjv3PfMs+5dvvsiAh6hofwdD1P9GxUZlQTMeSXlyAkxQrr/6kEwuF1bDKEBav87aCfrH8SDNIWf/3hB8Lgb0cMu2vgXI/9C3uK0FArXTHN4hW27p+RNdomQHZv9vxK2Hyf6ODIfSuE7u6QBIf984fQnNuc5bSGpN4RCSDlCnH7L2ghH8cofxKx2u2z+/rH6SSTu7IyyrEkN/if2f2JROXAz3hW3NfUff/7R+iNVX+Nwm6DMa+09F/8pVn+v3OIeV7PlRAFnWvEFq09PJg7bU1wiZVmg9YekBi4/z4jEmjuAaP24rG1xOEtsNS5A5eL0m73jwdWIjQv0QOtfjX32LCQhrv5B69uNZ7dcsmFWf3HLEqtPA0CtMeB8go3SAuW/8l3JpFWdIResBURYfZvpmfRma7ELXbH5GqNv+JdpIiY7OQaXbaz+08C9x4zS8+8/s1MQD6tvmXQ+LpuUpn8Whk1Dfbg+5Mo93m9li/Kx+isz99yx/arqqsZgfS6s9bDF0UWuhOw2Uj8HNP5i0RkxLjRE6ifG5pHJnr9A70DLklKLHqZfdMgvOvQvO5g+Jn3Jcj5zSTh9B3JyFlJ5HDObgtKnLQKAPXKeeCrGEH3syZ0JZ37A5mi4vroMNCyMKrEhzAD66BayYFJyyvtgjNHfp1DzFDLPjUkEAH18ATMVStO1HAR6fZbVpvPi+CJ/sXlxPzaNdF22PeBtIAfoa0garsDmz08lhCVeX+7+1DDlR/D6mGjqYZy+U1ce8Ipd3giDt/SNu9snv+aWaM14fRNvEE6dcCQ+pT829eLj66Oj2YIP6/PHfv76uOKOBF7f/D4Svjk5mM4lBjh9mSWzVvyR2DS2Vas6Reh4VahI1oYlad9MvwCVpRP+AUnV2FXNPqAvFSBSem7AnXS9X8xfdF/kPhPCZq21VIBI6RlGeeD158CyOBbTs2yg+uUEd9Y/hALEfWc4UcL1SSIOpFfs8xQgZ4i+HE2FuCQ2dEK5BuuTUNryL/yIcgLV52tQ2pYmRHOQftuB6xNHHlnH7OAIwh124dLtdhRz4ilA/4FZuFwxLw5wg/ooAenLAzErUgyOHPM+54hxj4lyIDaTl0VPDzVbvikLp0CaIetxK4x+31IOxDJL7Cj0zIH68pOxG5cfoIOyqYXRL+2azNeiwEhMZ6jHu0da09a7DnAJCpR+adcG/BcFBULfZupfXAjYJW8qjB0bzJ19lP656eltF1LZjVH6LlvXWxcxsS3Z5WmuDS9LjD6ZNz+c9yjDoXET1rr+T99YWfItRg6lZj3SFqWfcd9/1L5BdKr/phiqLz8cd5STtStlWO6aYikE63eF29O/w5KUNfkUpR8avczkUZaqrS4DMfoLi5oEmcs3Wr4qFO4Y/YFtOEDoL/mVilRl4BauH1OWofm7dLNMKgMR+gtbM0PlCwaOlWCYR4R+yOy/8IRXfwyo0+NfBjq9GX96By8TymExf+A+wfrZWtDP9al+T3mGf/asAOsPHMpzMym3l5Qnefy+Nmj+nVOBq2vUcVma14rRLxbPItM3IqnAMkih8uWNSvoZwDlEqm0Kkj8yNyH5mp6pQyWSsWvc/2xkeXoDTV8uKyrjeDuTlmFxs6hMDg3gK+hnZPIP0iQ7QVqYzKGziGpWPhw5VEnCGCrcRWSs2Yj/gWM2CDs/WA9VexneR9XY+9XTn1VJrPlvAUGzdejbXHcf/KkZ/sdmeHozisc6RuR9Wges/L1PPsPZR8jb+YV8jsHagsnvOyX5LOXX0/zmb4uUfAPTTmKy8wY/SMNzEdxW9ulzRL6bXegpfuAY+/diAb51PGn/3AqDrpcf58V4Oxlk5H/lJxdt5e+wtfWRAAAAAElFTkSuQmCC" width="128" height="128" />
513	+ <div style=" display: inline;
514	+ position: relative;
515	+ margin-left: 5px;
516	+ font-weight: 300;
517	+ top: -14px;
518	+ font-size: 20px;"> <?php _e( 'AMP has been updated to '.$ampforWPCurrentVersion, 'accelerated-mobile-pages' ); ?></div>
519	+ <a href="https://ampforwp.com/new/" target="_blank" style="
520	+ position: relative;
521	+ top: -17px;
522	+ background: #ECEFF1;
523	+ text-decoration: none;
524	+ color: #111;
525	+ font-size: 10px;
526	+ padding: 4px 6px 5px 5px;
527	+ border-radius: 4px;
528	+ margin-left: 5px;
529	+ text-transform: uppercase;
530	+ border: 1px solid rgba(207, 216, 220, 0.9);" href="admin.php?page=acmforwp_update">What's New?</a>
531	+ </div>
532	+ <div style="display:inline-block;float:right;height: 70px;background: #333;width: 50px;text-align: center;">
533	+ <a title="Close this Notification" style="color: #fff;
534	+ text-decoration: none;
535	+ top: 26px;
536	+ position: relative;
537	+ padding: 24px 18px;
538	+ font-size: 17px;
539	+ font-weight: 300;
540	+ background: #333;
541	+ z-index: 100;" href="<?php echo add_query_arg( 'ampforwp-dismiss', 'ampforwp_dismiss_admin_notices' ) ?>">X</a>
542	+ </div>
543	+
544	+ <div style="float: right;display: inline-block;/* height: 55px; */background: #4CAF50;padding: 12px 20px 11px 60px;background-image: url(data:image/svg+xml;utf8;base64,<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve" width="128px" height="128px">
<g>
	<g>
		<g>
			<path d="M366.905,365.071l87.902-85.683c6.087-5.935,8.236-14.643,5.61-22.729c-2.629-8.085-9.486-13.866-17.898-15.087     l-55.879-8.12c-4.413-0.647-8.521,2.419-9.161,6.837c-0.643,4.419,2.418,8.521,6.837,9.163l55.879,8.12     c2.278,0.33,4.135,1.896,4.847,4.083c0.711,2.19,0.129,4.548-1.519,6.154l-90.947,88.65c-1.905,1.858-2.773,4.533-2.323,7.155     l21.469,125.178c0.389,2.268-0.527,4.518-2.387,5.869c-1.816,1.318-4.339,1.502-6.322,0.459l-112.414-59.101     c-2.355-1.237-5.169-1.237-7.524,0l-112.414,59.101c-2.038,1.07-4.46,0.893-6.322-0.458c-1.861-1.353-2.775-3.602-2.388-5.87     l21.47-125.177c0.45-2.622-0.42-5.297-2.324-7.155l-90.946-88.649c-1.648-1.607-2.229-3.966-1.52-6.155     c0.712-2.188,2.567-3.753,4.846-4.083l125.684-18.263c2.633-0.382,4.91-2.036,6.087-4.422l56.209-113.891     c1.019-2.063,3.08-3.345,5.382-3.345s4.364,1.281,5.383,3.345l56.207,113.89c1.178,2.385,3.453,4.039,6.088,4.422l42.395,6.16     c4.405,0.641,8.52-2.418,9.161-6.837c0.643-4.418-2.418-8.521-6.837-9.162l-38.19-5.549l-54.326-110.077     c-3.761-7.624-11.379-12.359-19.88-12.359c-8.501,0-16.119,4.736-19.879,12.358l-54.328,110.078L51.149,241.572     c-8.412,1.222-15.27,7.003-17.897,15.089c-2.626,8.084-0.478,16.792,5.61,22.728l87.902,85.682l-20.75,120.989     c-1.438,8.377,1.94,16.685,8.818,21.683c3.888,2.823,8.434,4.258,13.011,4.258c3.523,0,7.065-0.85,10.337-2.569l108.654-57.122     l108.657,57.124c3.17,1.663,6.735,2.543,10.312,2.543c4.714,0,9.219-1.464,13.034-4.234c6.876-4.998,10.256-13.307,8.817-21.683     L366.905,365.071z" fill="#FFFFFF"/>
			<path d="M389.428,202.313c0.706-5.179,7.78-13.565,29.816-12.165c1.355,0.086,2.651,0.128,3.901,0.128     c27.699-0.002,30.054-20.639,31.63-34.498c0.874-7.677,1.699-14.928,5.275-20.053c2.553-3.662,1.653-8.701-2.007-11.254     c-3.662-2.552-8.701-1.655-11.255,2.006c-5.914,8.481-7.063,18.57-8.076,27.473c-1.746,15.343-2.41,21.087-18.438,20.063     c-17.664-1.127-30.86,2.656-39.232,11.242c-6.854,7.029-7.644,14.722-7.711,15.576l16.117,1.275     C389.449,202.106,389.447,202.179,389.428,202.313z" fill="#FFFFFF"/>
			<path d="M286.775,91.17c0.16-0.086,0.254-0.119,0.254-0.119l6.521,14.795c7.934-3.496,19.945-17.192,8.617-43.999     c-4.135-9.789-2.125-11.131,9.25-16.618c11.11-5.361,27.902-13.462,23.471-38.551c-0.775-4.397-4.962-7.327-9.367-6.555     c-4.397,0.777-7.33,4.971-6.554,9.367c2.205,12.48-3.177,15.678-14.576,21.177c-10.237,4.939-27.37,13.205-17.116,37.474     C293.459,82.779,289.871,89.505,286.775,91.17z" fill="#FFFFFF"/>
			<path d="M80.268,84.749c12.314,2.796,14.576,3.653,12.74,14.12c-5.028,28.665,9.75,39.319,18.266,40.946     c0.513,0.099,1.023,0.146,1.527,0.146c3.802,0,7.19-2.695,7.931-6.567c0.838-4.386-2.037-8.62-6.423-9.458     c-0.089-0.017-8.827-2.6-5.376-22.273c4.549-25.95-14.001-30.163-25.085-32.68c-12.341-2.803-18.303-4.712-18.953-17.369     c-0.229-4.458-4.006-7.894-8.488-7.659c-4.458,0.229-7.888,4.029-7.658,8.488C50.056,77.888,68.237,82.016,80.268,84.749z" fill="#FFFFFF"/>
			<path d="M105.239,181.113c0,6.121,2.382,11.874,6.71,16.201c4.328,4.328,10.081,6.711,16.201,6.711     c6.12,0,11.874-2.383,16.202-6.71c4.328-4.328,6.712-10.081,6.712-16.202s-2.384-11.874-6.711-16.202     c-4.329-4.328-10.082-6.711-16.203-6.711s-11.873,2.383-16.201,6.711C107.621,169.239,105.239,174.992,105.239,181.113z      M123.382,176.342c1.273-1.273,2.968-1.975,4.769-1.975c1.802,0,3.495,0.702,4.77,1.976c1.275,1.274,1.978,2.968,1.978,4.77     s-0.702,3.494-1.976,4.769c-1.275,1.274-2.969,1.976-4.772,1.976c-1.8,0-3.494-0.702-4.77-1.976     c-1.273-1.273-1.975-2.967-1.975-4.769C121.405,179.312,122.106,177.618,123.382,176.342z" fill="#FFFFFF"/>
			<path d="M315.285,129.189c-8.933,8.934-8.933,23.47,0.001,32.404c4.328,4.328,10.082,6.71,16.201,6.71     c6.119,0,11.874-2.382,16.202-6.71c8.933-8.934,8.933-23.47,0-32.403c-4.327-4.328-10.083-6.711-16.202-6.711     C325.368,122.479,319.613,124.86,315.285,129.189z M336.254,150.16c-1.273,1.273-2.967,1.974-4.769,1.974     c-1.802,0-3.495-0.701-4.77-1.974c-2.63-2.63-2.63-6.91-0.001-9.539c1.274-1.274,2.968-1.975,4.771-1.975     c1.801,0,3.494,0.701,4.769,1.974C338.884,143.25,338.884,147.53,336.254,150.16z" fill="#FFFFFF"/>
			<path d="M75.695,336.926c-4.329-4.326-10.082-6.709-16.202-6.709c-6.12,0-11.873,2.383-16.201,6.71     c-8.934,8.935-8.934,23.47,0,32.404c4.327,4.328,10.08,6.712,16.201,6.712s11.874-2.384,16.203-6.711     C84.629,360.396,84.629,345.862,75.695,336.926z M64.262,357.898c-1.273,1.274-2.967,1.977-4.77,1.977     c-1.8,0-3.494-0.702-4.769-1.977c-2.631-2.629-2.631-6.909-0.001-9.538c1.273-1.273,2.967-1.975,4.77-1.975     s3.496,0.701,4.77,1.975C66.893,350.989,66.893,355.269,64.262,357.898z" fill="#FFFFFF"/>
			<path d="M473.15,336.926c-4.329-4.326-10.082-6.709-16.201-6.709c-6.121,0-11.873,2.383-16.202,6.71     c-8.933,8.935-8.933,23.47,0,32.404c4.328,4.328,10.081,6.712,16.202,6.712c6.12,0,11.873-2.384,16.202-6.711     C482.084,360.396,482.084,345.862,473.15,336.926z M461.719,357.898c-1.274,1.274-2.968,1.977-4.77,1.977     c-1.801,0-3.495-0.702-4.769-1.977c-2.631-2.629-2.631-6.909-0.002-9.538c1.274-1.273,2.968-1.975,4.771-1.975     c1.801,0,3.496,0.701,4.77,1.975C464.349,350.989,464.349,355.269,461.719,357.898z" fill="#FFFFFF"/>
			<path d="M186.892,93.245c6.12,0,11.873-2.383,16.201-6.711c4.327-4.328,6.711-10.082,6.711-16.202     c0-6.121-2.384-11.874-6.711-16.2c-4.328-4.329-10.081-6.712-16.201-6.712c-6.122,0-11.874,2.383-16.202,6.711     c-4.328,4.327-6.712,10.08-6.712,16.201s2.384,11.874,6.711,16.202C175.018,90.861,180.77,93.245,186.892,93.245z      M182.122,65.562c1.273-1.274,2.968-1.975,4.771-1.975c1.8,0,3.493,0.701,4.769,1.976c1.273,1.273,1.977,2.967,1.977,4.769     c0,1.802-0.703,3.495-1.977,4.771c-1.274,1.273-2.968,1.975-4.769,1.975c-1.802,0-3.496-0.702-4.771-1.976     c-1.274-1.274-1.976-2.967-1.976-4.77C180.146,68.531,180.848,66.836,182.122,65.562z" fill="#FFFFFF"/>
			<circle cx="64.409" cy="160.22" r="10.496" fill="#FFFFFF"/>
			<circle cx="411.39" cy="374.115" r="10.496" fill="#FFFFFF"/>
			<circle cx="73.75" cy="439.343" r="10.497" fill="#FFFFFF"/>
			<path d="M387.929,148.951c2.107,0,4.213-0.819,5.799-2.448l11.23-11.553c3.111-3.201,3.039-8.319-0.162-11.431     c-3.199-3.112-8.318-3.039-11.431,0.162l-11.23,11.552c-3.111,3.201-3.04,8.319,0.162,11.431     C383.868,148.192,385.899,148.951,387.929,148.951z" fill="#FFFFFF"/>
			<path d="M148.822,136.182l14.937,6.04c0.993,0.401,2.02,0.591,3.027,0.591c3.197,0,6.227-1.909,7.497-5.056     c1.674-4.139-0.325-8.851-4.464-10.524l-14.938-6.04c-4.146-1.676-8.851,0.326-10.524,4.464     C142.684,129.797,144.683,134.508,148.822,136.182z" fill="#FFFFFF"/>
			<path d="M96.033,392.673l-14.938-6.04c-4.146-1.674-8.851,0.325-10.524,4.464c-1.673,4.14,0.326,8.852,4.465,10.524l14.938,6.041     c0.993,0.4,2.019,0.591,3.026,0.591c3.197,0,6.227-1.908,7.497-5.056C102.171,399.059,100.172,394.347,96.033,392.673z" fill="#FFFFFF"/>
			<path d="M436.945,420.284l-14.937-6.04c-4.146-1.673-8.852,0.326-10.524,4.465c-1.674,4.14,0.325,8.852,4.464,10.524l14.938,6.04     c0.993,0.4,2.019,0.592,3.027,0.592c3.196,0,6.226-1.91,7.497-5.057C443.083,426.669,441.085,421.957,436.945,420.284z" fill="#FFFFFF"/>
		</g>
	</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
);url(data: image/svg+xml;utf8;base64,<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve" width="32px" height="32px">
<g>
	<g>
		<g>
			<path d="M366.905,365.071l87.902-85.683c6.087-5.935,8.236-14.643,5.61-22.729c-2.629-8.085-9.486-13.866-17.898-15.087     l-55.879-8.12c-4.413-0.647-8.521,2.419-9.161,6.837c-0.643,4.419,2.418,8.521,6.837,9.163l55.879,8.12     c2.278,0.33,4.135,1.896,4.847,4.083c0.711,2.19,0.129,4.548-1.519,6.154l-90.947,88.65c-1.905,1.858-2.773,4.533-2.323,7.155     l21.469,125.178c0.389,2.268-0.527,4.518-2.387,5.869c-1.816,1.318-4.339,1.502-6.322,0.459l-112.414-59.101     c-2.355-1.237-5.169-1.237-7.524,0l-112.414,59.101c-2.038,1.07-4.46,0.893-6.322-0.458c-1.861-1.353-2.775-3.602-2.388-5.87     l21.47-125.177c0.45-2.622-0.42-5.297-2.324-7.155l-90.946-88.649c-1.648-1.607-2.229-3.966-1.52-6.155     c0.712-2.188,2.567-3.753,4.846-4.083l125.684-18.263c2.633-0.382,4.91-2.036,6.087-4.422l56.209-113.891     c1.019-2.063,3.08-3.345,5.382-3.345s4.364,1.281,5.383,3.345l56.207,113.89c1.178,2.385,3.453,4.039,6.088,4.422l42.395,6.16     c4.405,0.641,8.52-2.418,9.161-6.837c0.643-4.418-2.418-8.521-6.837-9.162l-38.19-5.549l-54.326-110.077     c-3.761-7.624-11.379-12.359-19.88-12.359c-8.501,0-16.119,4.736-19.879,12.358l-54.328,110.078L51.149,241.572     c-8.412,1.222-15.27,7.003-17.897,15.089c-2.626,8.084-0.478,16.792,5.61,22.728l87.902,85.682l-20.75,120.989     c-1.438,8.377,1.94,16.685,8.818,21.683c3.888,2.823,8.434,4.258,13.011,4.258c3.523,0,7.065-0.85,10.337-2.569l108.654-57.122     l108.657,57.124c3.17,1.663,6.735,2.543,10.312,2.543c4.714,0,9.219-1.464,13.034-4.234c6.876-4.998,10.256-13.307,8.817-21.683     L366.905,365.071z" fill="#cccccc"/>
			<path d="M389.428,202.313c0.706-5.179,7.78-13.565,29.816-12.165c1.355,0.086,2.651,0.128,3.901,0.128     c27.699-0.002,30.054-20.639,31.63-34.498c0.874-7.677,1.699-14.928,5.275-20.053c2.553-3.662,1.653-8.701-2.007-11.254     c-3.662-2.552-8.701-1.655-11.255,2.006c-5.914,8.481-7.063,18.57-8.076,27.473c-1.746,15.343-2.41,21.087-18.438,20.063     c-17.664-1.127-30.86,2.656-39.232,11.242c-6.854,7.029-7.644,14.722-7.711,15.576l16.117,1.275     C389.449,202.106,389.447,202.179,389.428,202.313z" fill="#cccccc"/>
			<path d="M286.775,91.17c0.16-0.086,0.254-0.119,0.254-0.119l6.521,14.795c7.934-3.496,19.945-17.192,8.617-43.999     c-4.135-9.789-2.125-11.131,9.25-16.618c11.11-5.361,27.902-13.462,23.471-38.551c-0.775-4.397-4.962-7.327-9.367-6.555     c-4.397,0.777-7.33,4.971-6.554,9.367c2.205,12.48-3.177,15.678-14.576,21.177c-10.237,4.939-27.37,13.205-17.116,37.474     C293.459,82.779,289.871,89.505,286.775,91.17z" fill="#cccccc"/>
			<path d="M80.268,84.749c12.314,2.796,14.576,3.653,12.74,14.12c-5.028,28.665,9.75,39.319,18.266,40.946     c0.513,0.099,1.023,0.146,1.527,0.146c3.802,0,7.19-2.695,7.931-6.567c0.838-4.386-2.037-8.62-6.423-9.458     c-0.089-0.017-8.827-2.6-5.376-22.273c4.549-25.95-14.001-30.163-25.085-32.68c-12.341-2.803-18.303-4.712-18.953-17.369     c-0.229-4.458-4.006-7.894-8.488-7.659c-4.458,0.229-7.888,4.029-7.658,8.488C50.056,77.888,68.237,82.016,80.268,84.749z" fill="#cccccc"/>
			<path d="M105.239,181.113c0,6.121,2.382,11.874,6.71,16.201c4.328,4.328,10.081,6.711,16.201,6.711     c6.12,0,11.874-2.383,16.202-6.71c4.328-4.328,6.712-10.081,6.712-16.202s-2.384-11.874-6.711-16.202     c-4.329-4.328-10.082-6.711-16.203-6.711s-11.873,2.383-16.201,6.711C107.621,169.239,105.239,174.992,105.239,181.113z      M123.382,176.342c1.273-1.273,2.968-1.975,4.769-1.975c1.802,0,3.495,0.702,4.77,1.976c1.275,1.274,1.978,2.968,1.978,4.77     s-0.702,3.494-1.976,4.769c-1.275,1.274-2.969,1.976-4.772,1.976c-1.8,0-3.494-0.702-4.77-1.976     c-1.273-1.273-1.975-2.967-1.975-4.769C121.405,179.312,122.106,177.618,123.382,176.342z" fill="#cccccc"/>
			<path d="M315.285,129.189c-8.933,8.934-8.933,23.47,0.001,32.404c4.328,4.328,10.082,6.71,16.201,6.71     c6.119,0,11.874-2.382,16.202-6.71c8.933-8.934,8.933-23.47,0-32.403c-4.327-4.328-10.083-6.711-16.202-6.711     C325.368,122.479,319.613,124.86,315.285,129.189z M336.254,150.16c-1.273,1.273-2.967,1.974-4.769,1.974     c-1.802,0-3.495-0.701-4.77-1.974c-2.63-2.63-2.63-6.91-0.001-9.539c1.274-1.274,2.968-1.975,4.771-1.975     c1.801,0,3.494,0.701,4.769,1.974C338.884,143.25,338.884,147.53,336.254,150.16z" fill="#cccccc"/>
			<path d="M75.695,336.926c-4.329-4.326-10.082-6.709-16.202-6.709c-6.12,0-11.873,2.383-16.201,6.71     c-8.934,8.935-8.934,23.47,0,32.404c4.327,4.328,10.08,6.712,16.201,6.712s11.874-2.384,16.203-6.711     C84.629,360.396,84.629,345.862,75.695,336.926z M64.262,357.898c-1.273,1.274-2.967,1.977-4.77,1.977     c-1.8,0-3.494-0.702-4.769-1.977c-2.631-2.629-2.631-6.909-0.001-9.538c1.273-1.273,2.967-1.975,4.77-1.975     s3.496,0.701,4.77,1.975C66.893,350.989,66.893,355.269,64.262,357.898z" fill="#cccccc"/>
			<path d="M473.15,336.926c-4.329-4.326-10.082-6.709-16.201-6.709c-6.121,0-11.873,2.383-16.202,6.71     c-8.933,8.935-8.933,23.47,0,32.404c4.328,4.328,10.081,6.712,16.202,6.712c6.12,0,11.873-2.384,16.202-6.711     C482.084,360.396,482.084,345.862,473.15,336.926z M461.719,357.898c-1.274,1.274-2.968,1.977-4.77,1.977     c-1.801,0-3.495-0.702-4.769-1.977c-2.631-2.629-2.631-6.909-0.002-9.538c1.274-1.273,2.968-1.975,4.771-1.975     c1.801,0,3.496,0.701,4.77,1.975C464.349,350.989,464.349,355.269,461.719,357.898z" fill="#cccccc"/>
			<path d="M186.892,93.245c6.12,0,11.873-2.383,16.201-6.711c4.327-4.328,6.711-10.082,6.711-16.202     c0-6.121-2.384-11.874-6.711-16.2c-4.328-4.329-10.081-6.712-16.201-6.712c-6.122,0-11.874,2.383-16.202,6.711     c-4.328,4.327-6.712,10.08-6.712,16.201s2.384,11.874,6.711,16.202C175.018,90.861,180.77,93.245,186.892,93.245z      M182.122,65.562c1.273-1.274,2.968-1.975,4.771-1.975c1.8,0,3.493,0.701,4.769,1.976c1.273,1.273,1.977,2.967,1.977,4.769     c0,1.802-0.703,3.495-1.977,4.771c-1.274,1.273-2.968,1.975-4.769,1.975c-1.802,0-3.496-0.702-4.771-1.976     c-1.274-1.274-1.976-2.967-1.976-4.77C180.146,68.531,180.848,66.836,182.122,65.562z" fill="#cccccc"/>
			<circle cx="64.409" cy="160.22" r="10.496" fill="#cccccc"/>
			<circle cx="411.39" cy="374.115" r="10.496" fill="#cccccc"/>
			<circle cx="73.75" cy="439.343" r="10.497" fill="#cccccc"/>
			<path d="M387.929,148.951c2.107,0,4.213-0.819,5.799-2.448l11.23-11.553c3.111-3.201,3.039-8.319-0.162-11.431     c-3.199-3.112-8.318-3.039-11.431,0.162l-11.23,11.552c-3.111,3.201-3.04,8.319,0.162,11.431     C383.868,148.192,385.899,148.951,387.929,148.951z" fill="#cccccc"/>
			<path d="M148.822,136.182l14.937,6.04c0.993,0.401,2.02,0.591,3.027,0.591c3.197,0,6.227-1.909,7.497-5.056     c1.674-4.139-0.325-8.851-4.464-10.524l-14.938-6.04c-4.146-1.676-8.851,0.326-10.524,4.464     C142.684,129.797,144.683,134.508,148.822,136.182z" fill="#cccccc"/>
			<path d="M96.033,392.673l-14.938-6.04c-4.146-1.674-8.851,0.325-10.524,4.464c-1.673,4.14,0.326,8.852,4.465,10.524l14.938,6.041     c0.993,0.4,2.019,0.591,3.026,0.591c3.197,0,6.227-1.908,7.497-5.056C102.171,399.059,100.172,394.347,96.033,392.673z" fill="#cccccc"/>
			<path d="M436.945,420.284l-14.937-6.04c-4.146-1.673-8.852,0.326-10.524,4.465c-1.674,4.14,0.325,8.852,4.464,10.524l14.938,6.04     c0.993,0.4,2.019,0.592,3.027,0.592c3.196,0,6.226-1.91,7.497-5.057C443.083,426.669,441.085,421.957,436.945,420.284z" fill="#cccccc"/>
		</g>
	</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
);background-size: 34px;background-repeat: no-repeat;text-align: right;background-position: 16px 17px;">
545	+ <a class="star_icon" href="https://wordpress.org/support/view/plugin-reviews/accelerated-mobile-pages?rate=5#new-post" target="_blank" style=" color: #fff;
546	+ text-decoration: none;
547	+ font-size: 16px;
548	+ line-height: 23px; font-weight: 300;"> Appreciate it? <br> <span style="font-size: 11px;text-transform: uppercase;" title="Give Us 5 Star">Leave a Review →</span></a>
549	+
550	+ </div>
551	+ </div>
552	+
553	+
554	+ <?php
555	+ //update_option( 'AMPforwp_db_version', $ampforWPCurrentVersion );
556	}

images/gf.png ADDED Viewed

Binary file

includes/admin-style.css CHANGED Viewed

	@@ -31,4 +31,7 @@ body #toplevel_page_amp_options .wp-menu-image{
31	position: relative;
32	top: -1px;
33	left: 5px;



34	}


31	position: relative;
32	top: -1px;
33	left: 5px;
34	+ }
35	+ .amp-update-notice .notice-dismiss{
36	+ display: none
37	}

includes/includes.php CHANGED Viewed

	@@ -25,7 +25,7 @@
25	if (! function_exists( 'ampforwp_footermenu') ) {
26	function ampforwp_footermenu() {
27	global $redux_builder_amp;
28	- if ( $redux_builder_amp['amp-design-selector'] == 1 \|\|
29	$redux_builder_amp['amp-design-selector'] == 2 \|\|
30	$redux_builder_amp['amp-design-selector'] == 3 ) {
31	register_nav_menus(


25	if (! function_exists( 'ampforwp_footermenu') ) {
26	function ampforwp_footermenu() {
27	global $redux_builder_amp;
28	+ if ( (isset($redux_builder_amp['amp-design-selector'])) && $redux_builder_amp['amp-design-selector'] == 1 \|\|
29	$redux_builder_amp['amp-design-selector'] == 2 \|\|
30	$redux_builder_amp['amp-design-selector'] == 3 ) {
31	register_nav_menus(

includes/options/admin-config.php CHANGED Viewed

	@@ -29,6 +29,14 @@ $extension_listing = '
29	<div class="extension_btn">From: $39</div>
30	</div>
31	</a></li>








32	<li class="first"><a href="http://ampforwp.com/opt-in-forms/#utm_source=options-panel&utm_medium=extension-tab_opt-in-forms&utm_campaign=AMP%20Plugin" target="_blank">
33	<div class="align_left"><img src="'.AMPFORWP_IMAGE_DIR . '/email.png" /></div>
34	<div class="extension_desc">
	@@ -634,6 +642,7 @@ Redux::setArgs( "redux_builder_amp", $args );
634	'type' => 'select',
635	'title' => __( 'Design Selector', 'accelerated-mobile-pages' ),
636	'subtitle' => __( 'Select your design.', 'accelerated-mobile-pages' ),

637	'options' => array(
638	'1' => __('Design One', 'accelerated-mobile-pages' ),
639	'2' => __('Design Two', 'accelerated-mobile-pages' ),
	@@ -1858,7 +1867,7 @@ Redux::setArgs( "redux_builder_amp", $args );
1858	'type' => 'text',
1859	'title' => __('Tag Manager ID (Container ID)','accelerated-mobile-pages'),
1860	'default' => '',
1861	- 'desc' => __('Eg: GTM-5XXXXXP','accelerated-mobile-pages'),
1862	// 'validate' => 'not_empty',
1863	'required' => array(
1864	array('amp-use-gtm-option', '=' , '1')
	@@ -1968,6 +1977,7 @@ Redux::setArgs( "redux_builder_amp", $args );
1968	'true' => 'Enabled',
1969	'false' => 'Disabled',
1970	),

1971	array(
1972	// 'title' => __('Notification text', 'accelerated-mobile-pages'),
1973	'id' => 'info_normal',
	@@ -1975,6 +1985,21 @@ Redux::setArgs( "redux_builder_amp", $args );
1975	'required' => array('amp-enable-contactform', '=' , '1'),
1976	'desc' => '<div style=" background: #FFF9C4;padding: 12px;line-height: 1.6;margin: -35px -12px 0 -12px;"><b>ONE LAST STEP REQUIRED:</b> This feature requires <a href="https://ampforwp.com/contact-form-7/#utm_source=options-panel&utm_medium=cf7-tab_cf7_installation_link&utm_campaign=AMP%20Plugin" target="_blank">Contact Form 7 extension</a>.<br /> <div style="margin-top:4px;">(<a href="https://ampforwp.com/contact-form-7/#utm_source=options-panel&utm_medium=cf7-tab_cf7_installation_link&utm_campaign=AMP%20Plugin" target="_blank">Click here for more info</a>)</div></div>',
1977	),















1978	),
1979
1980	) );
	@@ -2569,6 +2594,36 @@ Redux::setSection( $opt_name, array(
2569	'desc' => ' <a href="http://ampforwp.com/priority-support/#utm_source=options-panel&utm_medium=extension-tab_priority_support&utm_campaign=AMP%20Plugin" target="_blank"><img class="ampforwp-support-banner" src="'.AMPFORWP_IMAGE_DIR . '/priority-support-banner.png" width="345" height="500" /></a>',
2570	'icon' => 'el el-hand-right',
2571	) );






























2572	/*
2573	* <--- END SECTIONS
2574	*/


29	<div class="extension_btn">From: $39</div>
30	</div>
31	</a></li>
32	+ <li class="second"><a href="http://ampforwp.com/gravity-forms/#utm_source=options-panel&utm_medium=extension-tab_gf&utm_campaign=AMP%20Plugin" target="_blank">
33	+ <div class="align_left"><img src="'.AMPFORWP_IMAGE_DIR . '/gf.png" /></div>
34	+ <div class="extension_desc">
35	+ <h2>Gravity Forms</h2>
36	+ <p>Add Gravity Forms Support in AMP.</p>
37	+ <div class="extension_btn">From: $79</div>
38	+ </div>
39	+ </a></li>
40	<li class="first"><a href="http://ampforwp.com/opt-in-forms/#utm_source=options-panel&utm_medium=extension-tab_opt-in-forms&utm_campaign=AMP%20Plugin" target="_blank">
41	<div class="align_left"><img src="'.AMPFORWP_IMAGE_DIR . '/email.png" /></div>
42	<div class="extension_desc">

642	'type' => 'select',
643	'title' => __( 'Design Selector', 'accelerated-mobile-pages' ),
644	'subtitle' => __( 'Select your design.', 'accelerated-mobile-pages' ),
645	+ 'desc' => '<a href="https://ampforwp.com/themes/" target="_blank">View More AMP Themes →</a>',
646	'options' => array(
647	'1' => __('Design One', 'accelerated-mobile-pages' ),
648	'2' => __('Design Two', 'accelerated-mobile-pages' ),

1867	'type' => 'text',
1868	'title' => __('Tag Manager ID (Container ID)','accelerated-mobile-pages'),
1869	'default' => '',
1870	+ 'desc' => __('Eg: GTM-5XXXXXP (<a href="https://ampforwp.com/tutorials/article/gtm-in-amp/">Getting Started?</a>)','accelerated-mobile-pages'),
1871	// 'validate' => 'not_empty',
1872	'required' => array(
1873	array('amp-use-gtm-option', '=' , '1')

1977	'true' => 'Enabled',
1978	'false' => 'Disabled',
1979	),
1980	+
1981	array(
1982	// 'title' => __('Notification text', 'accelerated-mobile-pages'),
1983	'id' => 'info_normal',

1985	'required' => array('amp-enable-contactform', '=' , '1'),
1986	'desc' => '<div style=" background: #FFF9C4;padding: 12px;line-height: 1.6;margin: -35px -12px 0 -12px;"><b>ONE LAST STEP REQUIRED:</b> This feature requires <a href="https://ampforwp.com/contact-form-7/#utm_source=options-panel&utm_medium=cf7-tab_cf7_installation_link&utm_campaign=AMP%20Plugin" target="_blank">Contact Form 7 extension</a>.<br /> <div style="margin-top:4px;">(<a href="https://ampforwp.com/contact-form-7/#utm_source=options-panel&utm_medium=cf7-tab_cf7_installation_link&utm_campaign=AMP%20Plugin" target="_blank">Click here for more info</a>)</div></div>',
1987	),
1988	+ array(
1989	+ 'id' =>'amp-enable-gravityforms_support',
1990	+ 'type' => 'switch',
1991	+ 'title' => __('Gravity Forms Support', 'accelerated-mobile-pages'),
1992	+ 'default' => '',
1993	+ 'true' => 'Enabled',
1994	+ 'false' => 'Disabled',
1995	+ ),
1996	+ array(
1997	+ // 'title' => __('Notification text', 'accelerated-mobile-pages'),
1998	+ 'id' => 'info_normal_2',
1999	+ 'type' => 'info',
2000	+ 'required' => array('amp-enable-gravityforms_support', '=' , '1'),
2001	+ 'desc' => '<div style=" background: #FFF9C4;padding: 12px;line-height: 1.6;margin: -35px -12px 0 -12px;"><b>ONE LAST STEP REQUIRED:</b> This feature requires <a href="https://ampforwp.com/gravity-forms/#utm_source=options-panel&utm_medium=gf-tab_gf_installation_link&utm_campaign=AMP%20Plugin" target="_blank">Gravity Forms extension</a>.<br /> <div style="margin-top:4px;">(<a href="https://ampforwp.com/gravity-forms/#utm_source=options-panel&utm_medium=gf-tab_gf_installation_link&utm_campaign=AMP%20Plugin" target="_blank">Click here for more info</a>)</div></div>',
2002	+ ),
2003	),
2004
2005	) );

2594	'desc' => ' <a href="http://ampforwp.com/priority-support/#utm_source=options-panel&utm_medium=extension-tab_priority_support&utm_campaign=AMP%20Plugin" target="_blank"><img class="ampforwp-support-banner" src="'.AMPFORWP_IMAGE_DIR . '/priority-support-banner.png" width="345" height="500" /></a>',
2595	'icon' => 'el el-hand-right',
2596	) );
2597	+
2598	+
2599	+
2600	+ // Plugin Manager
2601	+ Redux::setSection( $opt_name, array(
2602	+ 'title' => __( 'Plugins Manager', 'accelerated-mobile-pages' ),
2603	+ 'id' => 'opt-plugins-manager',
2604	+ 'subsection' => false,
2605	+ 'desc' => 'You can Disable Plugins only in AMP which are causing AMP validation errors. <a href="http://ampforwp.com/plugins-manager" target="_blank">More Information.</a>',
2606	+ 'icon' => 'el el-magic',
2607	+ 'fields' => array(
2608	+
2609	+ array(
2610	+ 'id' => 'ampforwp-plugin-manager-core',
2611	+ 'type' => 'switch',
2612	+ 'title' => __('Enable Plugin Manager', 'accelerated-mobile-pages'),
2613	+ 'default' => 0
2614	+ ),
2615	+ array(
2616	+ // 'title' => __('Notification text', 'accelerated-mobile-pages'),
2617	+ 'id' => 'info_normal',
2618	+ 'type' => 'info',
2619	+ 'required' => array('ampforwp-plugin-manager-core', '=' , '1'),
2620	+ 'desc' => '<div style=" background: #FFF9C4;padding: 12px;line-height: 1.6;margin: -35px -12px 0 -12px;"><b>ONE LAST STEP REQUIRED:</b> This feature requires <a href="https://ampforwp.com/plugins-manager" target="_blank">AMP Plugin Manager</a>.<br /> <div style="margin-top:4px;">(<a href="https://ampforwp.com/plugins-manager" target="_blank">Click here for more info</a>)</div></div>',
2621	+ ),
2622	+ )
2623	+ ) );
2624	+
2625	+
2626	+
2627	/*
2628	* <--- END SECTIONS
2629	*/

includes/redirect.php CHANGED Viewed

	@@ -21,7 +21,7 @@ function ampforwp_page_template_redirect() {
21	global $redux_builder_amp;
22	$post_type = '';
23
24	- if($redux_builder_amp['amp-mobile-redirection']){
25
26	if( ampforwp_meta_redirection_status()=='disable' ){
27	return;
	@@ -49,7 +49,7 @@ function ampforwp_page_template_redirect() {
49	}
50	}
51	session_start();
52	- if( $_SESSION['ampforwp_amp_mode']=='mobile-on' && $_SESSION['ampforwp_mobile']=='exit'){
53	return;
54	}
55	if( wp_is_mobile() && $_SESSION['ampforwp_amp_mode']=='mobile-on' && $_GET['nonamp']==1){


21	global $redux_builder_amp;
22	$post_type = '';
23
24	+ if( isset($redux_builder_amp['amp-mobile-redirection']) && $redux_builder_amp['amp-mobile-redirection']){
25
26	if( ampforwp_meta_redirection_status()=='disable' ){
27	return;

49	}
50	}
51	session_start();
52	+ if( isset($_SESSION['ampforwp_mobile']) && $_SESSION['ampforwp_amp_mode']=='mobile-on' && $_SESSION['ampforwp_mobile']=='exit'){
53	return;
54	}
55	if( wp_is_mobile() && $_SESSION['ampforwp_amp_mode']=='mobile-on' && $_GET['nonamp']==1){

readme.txt CHANGED Viewed

	@@ -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/5
5	Requires at least: 3.0
6	Tested up to: 4.8.1
7	- Stable tag: 0.9.~~58.1~~
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -29,10 +29,12 @@ Bug reports for AMP for WP are [welcomed on GitHub](https://github.com/ahmedkalu
29
30	= Features: =
31


32	* NEW - Page Break / NextPage (Pagination) Support
33	* NEW - Contact Form 7 Support [More Info](https://ampforwp.com/contact-form-7/)
34	* NEW - Page Builder for AMP! [Watch the Demo](http://ampforwp.com/demo/#pagebuilder) \| [How to](https://ampforwp.com/tutorials/page-builder/)
35	- * ~~NEW -~~ Facebook Comments Support
36	* Github Gist Support
37	* Email Opt-in Subscription form support in AMP added
38	* Call to Action boxes and notification bars
	@@ -138,6 +140,25 @@ You can contact me using this url: http://ampforwp.com/contact/
138
139	== Changelog ==
140



















141	= 0.9.58.1 (9th August 2017) =
142	* Jetpack conflict issue solved #1038
143	* Genesis SEO Support added #1013


4	Donate link: https://www.paypal.me/Kaludi/5
5	Requires at least: 3.0
6	Tested up to: 4.8.1
7	+ Stable tag: 0.9.59
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

29
30	= Features: =
31
32	+ * NEW - Gravity Forms Support [More Info](https://ampforwp.com/gravity-forms/)
33	+ * NEW - AMP Plugins Manager - Which allows you to disable a specific plugin functionality only in the AMP version
34	* NEW - Page Break / NextPage (Pagination) Support
35	* NEW - Contact Form 7 Support [More Info](https://ampforwp.com/contact-form-7/)
36	* NEW - Page Builder for AMP! [Watch the Demo](http://ampforwp.com/demo/#pagebuilder) \| [How to](https://ampforwp.com/tutorials/page-builder/)
37	+ * Facebook Comments Support
38	* Github Gist Support
39	* Email Opt-in Subscription form support in AMP added
40	* Call to Action boxes and notification bars

140
141	== Changelog ==
142
143	+ = 0.9.59 (23th August 2017) =
144	+ * Design 3 Images were not aligned properly. Fixed. #1040
145	+ * Caption in the design 3 improved
146	+ * Jetpack File not loading throwing fatal error #1038
147	+ * If the mobile redirection is ON and the category is excluded to display the AMP then it should redirect properly
148	+ * Custom Editor Compatibility issue with SiteOrigin PageBuilder fixed #997
149	+ * Native Twitter Embed support
150	+ * Added a hook after the body tag: ampforwp_body_beginning (commit)
151	+ * GTM in AMP Improved #958
152	+ * WP User Avatar compatibility Added #975
153	+ * Alt tag on frontpage featured image added #1050
154	+ * Blurred Images on the frontpage fixed #1050
155	+ * Need to escape alt tag #1049
156	+ * Debug errors & PHP warnings were fixed #859 #811 #830 #810
157	+ * Proper rel canonicals for inner pages #1047
158	+ * Added Video sanitizer for comments #1053
159	+ * When activating the AMP plugin, display a notification in the popup. #1036
160	+ * Video Sanitizer added for Comments
161	+
162	= 0.9.58.1 (9th August 2017) =
163	* Jetpack conflict issue solved #1038
164	* Genesis SEO Support added #1013

templates/design-manager/design-1/archive.php CHANGED Viewed

	@@ -35,7 +35,7 @@
35	</head>
36
37	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> design_1_wrapper">
38	-
39	<?php $this->load_parts( array( 'header-bar' ) ); ?>
40
41	<article class="amp-wp-article ampforwp-custom-index amp-wp-home">


35	</head>
36
37	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> design_1_wrapper">
38	+ <?php do_action('ampforwp_body_beginning', $this); ?>
39	<?php $this->load_parts( array( 'header-bar' ) ); ?>
40
41	<article class="amp-wp-article ampforwp-custom-index amp-wp-home">

templates/design-manager/design-1/elements/comments.php CHANGED Viewed

	@@ -48,7 +48,8 @@ if (!comments_open() \|\| $redux_builder_amp['ampforwp-disqus-comments-support'] \|
48	// Added <p> tag in comments #873
49	$comment_content = wpautop( $comment_content );
50
51	- $sanitizer = new AMPFORWP_Content( $comment_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array() ~~) ) );~~

52	$sanitized_comment_content = $sanitizer->get_amp_content();
53	echo make_clickable( $sanitized_comment_content ); ?>
54


48	// Added <p> tag in comments #873
49	$comment_content = wpautop( $comment_content );
50
51	+ $sanitizer = new AMPFORWP_Content( $comment_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array(),
52	+ 'AMP_Video_Sanitizer' => array() ) ) );
53	$sanitized_comment_content = $sanitizer->get_amp_content();
54	echo make_clickable( $sanitized_comment_content ); ?>
55

templates/design-manager/design-1/elements/meta-taxonomy.php CHANGED Viewed

	@@ -47,8 +47,12 @@ if( array_key_exists( 'amp-author-description' , $redux_builder_amp ) && is_sing
47	<div class="amp_author_area_wrapper">
48	<?php $post_author = $this->get( 'post_author' );
49	if ( $post_author ) {
50	-
51	- $author_avatar_url = ~~get_avatar_url~~( ~~$post_author->user_email, array( 'size' => 70~~ ) );




52	if ( $author_avatar_url ) { ?>
53	<amp-img src="<?php echo $author_avatar_url; ?>" width="70" height="70" layout="fixed"></amp-img>
54	<?php


47	<div class="amp_author_area_wrapper">
48	<?php $post_author = $this->get( 'post_author' );
49	if ( $post_author ) {
50	+ //If Avatar is set up in WP user avatar: grab it
51	+ $author_avatar_url = ampforwp_get_wp_user_avatar();
52	+ //Else : Get the Gravatar
53	+ if($author_avatar_url == null){
54	+ $author_avatar_url = get_avatar_url( $post_author->user_email, array( 'size' => 70 ) );
55	+ }
56	if ( $author_avatar_url ) { ?>
57	<amp-img src="<?php echo $author_avatar_url; ?>" width="70" height="70" layout="fixed"></amp-img>
58	<?php

templates/design-manager/design-1/frontpage.php CHANGED Viewed

	@@ -24,6 +24,7 @@ $template = new AMP_Post_Template( $post_id );?>
24	</style>
25	</head>
26	<body class="single-post <?php ampforwp_the_body_class(); ?> amp-wp-frontpage design_1_wrapper">

27	<?php $this->load_parts( array( 'header-bar' ) ); ?>
28
29	<?php do_action('ampforwp_frontpage_above_loop',$template, $post_id) ?>


24	</style>
25	</head>
26	<body class="single-post <?php ampforwp_the_body_class(); ?> amp-wp-frontpage design_1_wrapper">
27	+ <?php do_action('ampforwp_body_beginning', $this); ?>
28	<?php $this->load_parts( array( 'header-bar' ) ); ?>
29
30	<?php do_action('ampforwp_frontpage_above_loop',$template, $post_id) ?>

templates/design-manager/design-1/index.php CHANGED Viewed

	@@ -12,7 +12,7 @@
12	</head>
13
14	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> design_1_wrapper">
15	-
16	<?php $this->load_parts( array( 'header-bar' ) ); ?>
17
18


12	</head>
13
14	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> design_1_wrapper">
15	+ <?php do_action('ampforwp_body_beginning', $this); ?>
16	<?php $this->load_parts( array( 'header-bar' ) ); ?>
17
18

templates/design-manager/design-1/search.php CHANGED Viewed

	@@ -25,7 +25,7 @@
25	</head>
26
27	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> design_1_wrapper">
28	-
29	<?php $this->load_parts( array( 'header-bar' ) ); ?>
30
31	<article class="amp-wp-article ampforwp-custom-index amp-wp-home">


25	</head>
26
27	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> design_1_wrapper">
28	+ <?php do_action('ampforwp_body_beginning', $this); ?>
29	<?php $this->load_parts( array( 'header-bar' ) ); ?>
30
31	<article class="amp-wp-article ampforwp-custom-index amp-wp-home">

templates/design-manager/design-1/single.php CHANGED Viewed

	@@ -11,7 +11,7 @@
11	</head>
12
13	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> single-post <?php ampforwp_the_body_class(); ?> <?php if(is_page()){ echo'amp-single-page'; };?> design_1_wrapper">
14	-
15	<?php $this->load_parts( array( 'header-bar' ) ); ?>
16
17	<article class="amp-wp-article">


11	</head>
12
13	<body class="<?php echo esc_attr( $this->get( 'body_class' ) ); ?> single-post <?php ampforwp_the_body_class(); ?> <?php if(is_page()){ echo'amp-single-page'; };?> design_1_wrapper">
14	+ <?php do_action('ampforwp_body_beginning', $this); ?>
15	<?php $this->load_parts( array( 'header-bar' ) ); ?>
16
17	<article class="amp-wp-article">

templates/design-manager/design-1/style.php CHANGED Viewed

	@@ -1,6 +1,9 @@
1	<?php add_action('amp_post_template_css', 'ampforwp_additional_style_input');
2	function ampforwp_additional_style_input( $amp_template ) {
3	global $redux_builder_amp;



4	$get_customizer = new AMP_Post_Template( $post_id );
5	$content_max_width = absint( $get_customizer->get( 'content_max_width' ) );
6	$theme_color = $get_customizer->get_customizer_setting( 'theme_color' );


1	<?php add_action('amp_post_template_css', 'ampforwp_additional_style_input');
2	function ampforwp_additional_style_input( $amp_template ) {
3	global $redux_builder_amp;
4	+ global $post;
5	+ $post_id = '';
6	+ $post_id = $post->ID;
7	$get_customizer = new AMP_Post_Template( $post_id );
8	$content_max_width = absint( $get_customizer->get( 'content_max_width' ) );
9	$theme_color = $get_customizer->get_customizer_setting( 'theme_color' );

templates/design-manager/design-2/archive.php CHANGED Viewed

	@@ -35,6 +35,7 @@
35	</style>
36	</head>
37	<body class="amp_home_body design_2_wrapper">

38	<?php $this->load_parts( array( 'header-bar' ) ); ?>
39
40	<?php do_action( 'ampforwp_after_header', $this ); ?>


35	</style>
36	</head>
37	<body class="amp_home_body design_2_wrapper">
38	+ <?php do_action('ampforwp_body_beginning', $this); ?>
39	<?php $this->load_parts( array( 'header-bar' ) ); ?>
40
41	<?php do_action( 'ampforwp_after_header', $this ); ?>

templates/design-manager/design-2/elements/comments.php CHANGED Viewed

	@@ -47,7 +47,8 @@ if (!comments_open() \|\| $redux_builder_amp['ampforwp-disqus-comments-support'] \|
47	$comment_content = get_comment_text();
48	// Added <p> tag in comments #873
49	$comment_content = wpautop( $comment_content );
50	- $sanitizer = new AMPFORWP_Content( $comment_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array() ~~) ) );~~

51	$sanitized_comment_content = $sanitizer->get_amp_content();
52	echo make_clickable( $sanitized_comment_content ); ?>
53	</div>


47	$comment_content = get_comment_text();
48	// Added <p> tag in comments #873
49	$comment_content = wpautop( $comment_content );
50	+ $sanitizer = new AMPFORWP_Content( $comment_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array(),
51	+ 'AMP_Video_Sanitizer' => array() ) ) );
52	$sanitized_comment_content = $sanitizer->get_amp_content();
53	echo make_clickable( $sanitized_comment_content ); ?>
54	</div>

templates/design-manager/design-2/elements/meta-taxonomy.php CHANGED Viewed

	@@ -36,8 +36,12 @@ if( array_key_exists( 'amp-author-description' , $redux_builder_amp ) && is_sing
36	<div class="amp_author_area_wrapper">
37	<?php $post_author = $this->get( 'post_author' );
38	if ( $post_author ) {
39	-
40	- $author_avatar_url = ~~get_avatar_url~~( ~~$post_author->user_email, array( 'size' => 70~~ ) );




41	if ( $author_avatar_url ) { ?>
42	<amp-img src="<?php echo $author_avatar_url; ?>" width="70" height="70" layout="fixed"></amp-img>
43	<?php


36	<div class="amp_author_area_wrapper">
37	<?php $post_author = $this->get( 'post_author' );
38	if ( $post_author ) {
39	+ //If Avatar is set up in WP user avatar: grab it
40	+ $author_avatar_url = ampforwp_get_wp_user_avatar();
41	+ //Else : Get the Gravatar
42	+ if($author_avatar_url == null){
43	+ $author_avatar_url = get_avatar_url( $post_author->user_email, array( 'size' => 70 ) );
44	+ }
45	if ( $author_avatar_url ) { ?>
46	<amp-img src="<?php echo $author_avatar_url; ?>" width="70" height="70" layout="fixed"></amp-img>
47	<?php

templates/design-manager/design-2/frontpage.php CHANGED Viewed

	@@ -23,6 +23,7 @@ $template = new AMP_Post_Template( $post_id );?>
23	</style>
24	</head>
25	<body class="single-post <?php ampforwp_the_body_class(); ?> design_2_wrapper">

26	<?php $this->load_parts( array( 'header-bar' ) ); ?>
27
28	<?php do_action( 'ampforwp_design_2_frontpage_title', $template ); ?>


23	</style>
24	</head>
25	<body class="single-post <?php ampforwp_the_body_class(); ?> design_2_wrapper">
26	+ <?php do_action('ampforwp_body_beginning', $this); ?>
27	<?php $this->load_parts( array( 'header-bar' ) ); ?>
28
29	<?php do_action( 'ampforwp_design_2_frontpage_title', $template ); ?>

templates/design-manager/design-2/index.php CHANGED Viewed

	@@ -11,6 +11,7 @@
11	</style>
12	</head>
13	<body class="amp_home_body design_2_wrapper">

14	<?php $this->load_parts( array( 'header-bar' ) ); ?>
15	<?php do_action( 'ampforwp_after_header', $this ); ?>
16	<?php do_action('ampforwp_home_above_loop') ?>


11	</style>
12	</head>
13	<body class="amp_home_body design_2_wrapper">
14	+ <?php do_action('ampforwp_body_beginning', $this); ?>
15	<?php $this->load_parts( array( 'header-bar' ) ); ?>
16	<?php do_action( 'ampforwp_after_header', $this ); ?>
17	<?php do_action('ampforwp_home_above_loop') ?>

templates/design-manager/design-2/search.php CHANGED Viewed

	@@ -23,6 +23,7 @@
23	</style>
24	</head>
25	<body class="amp_home_body design_2_wrapper">

26	<?php $this->load_parts( array( 'header-bar' ) ); ?>
27	<?php do_action( 'ampforwp_after_header', $this ); ?>
28	<main>


23	</style>
24	</head>
25	<body class="amp_home_body design_2_wrapper">
26	+ <?php do_action('ampforwp_body_beginning', $this); ?>
27	<?php $this->load_parts( array( 'header-bar' ) ); ?>
28	<?php do_action( 'ampforwp_after_header', $this ); ?>
29	<main>

templates/design-manager/design-2/single.php CHANGED Viewed

	@@ -11,6 +11,7 @@
11	</style>
12	</head>
13	<body class="single-post <?php ampforwp_the_body_class(); ?> <?php if(is_page()){ echo'amp-single-page'; };?> design_2_wrapper">

14	<?php $this->load_parts( array( 'header-bar' ) ); ?>
15
16	<?php do_action( 'ampforwp_after_header', $this ); ?>


11	</style>
12	</head>
13	<body class="single-post <?php ampforwp_the_body_class(); ?> <?php if(is_page()){ echo'amp-single-page'; };?> design_2_wrapper">
14	+ <?php do_action('ampforwp_body_beginning', $this); ?>
15	<?php $this->load_parts( array( 'header-bar' ) ); ?>
16
17	<?php do_action( 'ampforwp_after_header', $this ); ?>

templates/design-manager/design-2/style.php CHANGED Viewed

	@@ -7,6 +7,9 @@ add_action('amp_post_template_css', 'ampforwp_additional_style_input_2');
7
8	function ampforwp_additional_style_input_2( $amp_template ) {
9	global $redux_builder_amp;



10	$get_customizer = new AMP_Post_Template( $post_id );
11	// Get content width
12	$content_max_width = absint( $get_customizer->get( 'content_max_width' ) );
	@@ -147,6 +150,7 @@ figcaption{ font-size: 11px; margin-bottom: 11px; background: #eee; padding: 6px
147	.amp-wp-tax-tag{ font-size: 13px; border: 0; display: inline-block; margin: 0.5em 0px 0.7em 0px; width: 100%; }
148	main .amp-wp-content.featured-image-content{ padding: 0px; border: 0; margin-bottom: 0; box-shadow: none }
149	.amp-wp-article-featured-image amp-img {margin: 0 auto;}

150	.amp-wp-content.post-pagination-meta{ max-width: 1030px; }
151	.single-post .ampforwp-social-icons.ampforwp-social-icons-wrapper{ display: block; margin: 2em auto 0.9em auto ; max-width: 1030px; }
152	.amp-wp-article-header.amp-wp-article-category.ampforwp-meta-taxonomy{ margin: 10px auto; max-width: 1030px; } .ampforwp_single_excerpt { margin-bottom:15px; font-size: 15px;}


7
8	function ampforwp_additional_style_input_2( $amp_template ) {
9	global $redux_builder_amp;
10	+ global $post;
11	+ $post_id = '';
12	+ $post_id = $post->ID;
13	$get_customizer = new AMP_Post_Template( $post_id );
14	// Get content width
15	$content_max_width = absint( $get_customizer->get( 'content_max_width' ) );

150	.amp-wp-tax-tag{ font-size: 13px; border: 0; display: inline-block; margin: 0.5em 0px 0.7em 0px; width: 100%; }
151	main .amp-wp-content.featured-image-content{ padding: 0px; border: 0; margin-bottom: 0; box-shadow: none }
152	.amp-wp-article-featured-image amp-img {margin: 0 auto;}
153	+ .amp-wp-article-featured-image.wp-caption .wp-caption-text{color: #696969; font-size: 11px; line-height: 15px; background: #eee; margin: 0; padding: .66em .75em; text-align: center;}
154	.amp-wp-content.post-pagination-meta{ max-width: 1030px; }
155	.single-post .ampforwp-social-icons.ampforwp-social-icons-wrapper{ display: block; margin: 2em auto 0.9em auto ; max-width: 1030px; }
156	.amp-wp-article-header.amp-wp-article-category.ampforwp-meta-taxonomy{ margin: 10px auto; max-width: 1030px; } .ampforwp_single_excerpt { margin-bottom:15px; font-size: 15px;}

templates/design-manager/design-3/archive.php CHANGED Viewed

	@@ -34,6 +34,7 @@
34	</style>
35	</head>
36	<body class="amp_home_body archives_body design_3_wrapper">

37	<?php $this->load_parts( array( 'header-bar' ) ); ?>
38
39	<?php do_action( 'ampforwp_after_header', $this );


34	</style>
35	</head>
36	<body class="amp_home_body archives_body design_3_wrapper">
37	+ <?php do_action('ampforwp_body_beginning', $this); ?>
38	<?php $this->load_parts( array( 'header-bar' ) ); ?>
39
40	<?php do_action( 'ampforwp_after_header', $this );

templates/design-manager/design-3/elements/comments.php CHANGED Viewed

	@@ -46,7 +46,8 @@ if (!comments_open() \|\| $redux_builder_amp['ampforwp-disqus-comments-support'] \|
46	$comment_content = get_comment_text();
47	// Added <p> tag in comments #873
48	$comment_content = wpautop( $comment_content );
49	- $sanitizer = new AMPFORWP_Content( $comment_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array() ~~) ) );~~

50	$sanitized_comment_content = $sanitizer->get_amp_content();
51	echo make_clickable( $sanitized_comment_content ); ?>
52	</div>


46	$comment_content = get_comment_text();
47	// Added <p> tag in comments #873
48	$comment_content = wpautop( $comment_content );
49	+ $sanitizer = new AMPFORWP_Content( $comment_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array(),
50	+ 'AMP_Video_Sanitizer' => array() ) ) );
51	$sanitized_comment_content = $sanitizer->get_amp_content();
52	echo make_clickable( $sanitized_comment_content ); ?>
53	</div>

templates/design-manager/design-3/elements/meta-taxonomy.php CHANGED Viewed

	@@ -22,8 +22,12 @@ if( array_key_exists( 'amp-author-description' , $redux_builder_amp ) && is_sing
22	<div class="amp_author_area_wrapper">
23	<?php $post_author = $this->get( 'post_author' );
24	if ( $post_author ) {
25	-
26	- $author_avatar_url = ~~get_avatar_url~~( ~~$post_author->user_email, array( 'size' => 70~~ ) );




27	if ( $author_avatar_url ) { ?>
28	<amp-img src="<?php echo $author_avatar_url; ?>" width="70" height="70" layout="fixed"></amp-img>
29	<?php


22	<div class="amp_author_area_wrapper">
23	<?php $post_author = $this->get( 'post_author' );
24	if ( $post_author ) {
25	+ //If Avatar is set up in WP user avatar: grab it
26	+ $author_avatar_url = ampforwp_get_wp_user_avatar();
27	+ //Else : Get the Gravatar
28	+ if($author_avatar_url == null){
29	+ $author_avatar_url = get_avatar_url( $post_author->user_email, array( 'size' => 70 ) );
30	+ }
31	if ( $author_avatar_url ) { ?>
32	<amp-img src="<?php echo $author_avatar_url; ?>" width="70" height="70" layout="fixed"></amp-img>
33	<?php

templates/design-manager/design-3/frontpage.php CHANGED Viewed

	@@ -24,7 +24,7 @@ $template = new AMP_Post_Template( $post_id );?>
24	</style>
25	</head>
26	<body class="single-post <?php ampforwp_the_body_class(); ?> design_3_wrapper">
27	-
28	<?php $this->load_parts( array( 'header-bar' ) ); ?>
29
30	<?php do_action( 'ampforwp_design_3_frontpage_title', $template ); ?>


24	</style>
25	</head>
26	<body class="single-post <?php ampforwp_the_body_class(); ?> design_3_wrapper">
27	+ <?php do_action('ampforwp_body_beginning', $this); ?>
28	<?php $this->load_parts( array( 'header-bar' ) ); ?>
29
30	<?php do_action( 'ampforwp_design_3_frontpage_title', $template ); ?>

templates/design-manager/design-3/index.php CHANGED Viewed

	@@ -12,6 +12,7 @@
12	</style>
13	</head>
14	<body class="amp_home_body design_3_wrapper">

15	<?php $this->load_parts( array( 'header-bar' ) ); ?>
16
17	<div class="amp-wp-content">


12	</style>
13	</head>
14	<body class="amp_home_body design_3_wrapper">
15	+ <?php do_action('ampforwp_body_beginning', $this); ?>
16	<?php $this->load_parts( array( 'header-bar' ) ); ?>
17
18	<div class="amp-wp-content">

templates/design-manager/design-3/search.php CHANGED Viewed

	@@ -24,6 +24,7 @@
24	</style>
25	</head>
26	<body class="amp_home_body archives_body design_3_wrapper">

27	<?php $this->load_parts( array( 'header-bar' ) ); ?>
28
29	<?php do_action( 'ampforwp_after_header', $this ); ?>


24	</style>
25	</head>
26	<body class="amp_home_body archives_body design_3_wrapper">
27	+ <?php do_action('ampforwp_body_beginning', $this); ?>
28	<?php $this->load_parts( array( 'header-bar' ) ); ?>
29
30	<?php do_action( 'ampforwp_after_header', $this ); ?>

templates/design-manager/design-3/single.php CHANGED Viewed

	@@ -11,6 +11,7 @@
11	</style>
12	</head>
13	<body class="design_3_wrapper single-post <?php ampforwp_the_body_class(); ?> <?php if(is_page()){ echo'amp-single-page'; };?>">

14	<?php $this->load_parts( array( 'header-bar' ) ); ?>
15
16	<?php do_action( 'ampforwp_after_header', $this ); ?>


11	</style>
12	</head>
13	<body class="design_3_wrapper single-post <?php ampforwp_the_body_class(); ?> <?php if(is_page()){ echo'amp-single-page'; };?>">
14	+ <?php do_action('ampforwp_body_beginning', $this); ?>
15	<?php $this->load_parts( array( 'header-bar' ) ); ?>
16
17	<?php do_action( 'ampforwp_after_header', $this ); ?>

templates/design-manager/design-3/style.php CHANGED Viewed

	@@ -2,6 +2,9 @@
2	add_action('amp_post_template_css', 'ampforwp_additional_style_input_3');
3	function ampforwp_additional_style_input_3( $amp_template ) {
4	global $redux_builder_amp;



5	$get_customizer = new AMP_Post_Template( $post_id );
6	// Get content width
7	$colorscheme = $redux_builder_amp['amp-opt-color-rgba-colorscheme']['color'];
	@@ -121,7 +124,8 @@ body .amp-loop-list-noimg .amp-wp-post-content{ width:100% }
121	/* Single */
122	.single-post main{ margin: 20px 17px 17px 17px; }
123	.amp-wp-article-content{ font-family:'PT Serif', serif; }
124	- .single-post .post-featured-img~~, .single-post .amp-wp-article-content amp-img~~{ margin:0 17px 0px -17px }

125	.ampforwp-title{ padding: 0px 0px 0px 0px; margin-top: 12px; margin-bottom: 12px; }
126	.comment-button-wrapper{ margin-bottom: 50px; margin-top: 30px; text-align:center }
127	.comment-button-wrapper a{ color: #fff; background: #312c7e; font-size: 14px; padding: 12px 22px 12px 22px; font-family: 'Roboto Slab', serif; border-radius: 2px; text-transform: uppercase; letter-spacing: 1px; }
	@@ -150,6 +154,7 @@ figcaption{ font-size: 11px; line-height: 1.6; margin-bottom: 11px; background:
150	main .amp-wp-content.featured-image-content{ padding: 0px; border: 0; margin-bottom: 0; box-shadow: none }
151	.amp-wp-content .amp-wp-article-featured-image amp-img {margin: 0 auto;}
152	.archives_body main{ margin-top:30px }

153	/* Related Posts */
154	main .amp-wp-content.relatedpost{ background: none; box-shadow: none; padding:0px 0 0 0; margin:1.8em auto 1.5em auto }
155	.single-post ,.related-title,.single-post .comments_list h3{ font-size: 20px; color: #777; font-family:'Roboto Slab', serif; border-bottom: 1px solid #eee; font-weight: 400; padding-bottom: 1px; margin-bottom: 10px; }
	@@ -284,13 +289,8 @@ table tr:hover td { background: #f2f2f2; background: -webkit-gradient(linear, le
284
285	/* Responsive */
286	@media screen and (min-width: 650px) { table {display: inline-table;} }
287	- ~~@media~~ ~~screen and (min-width:1034px){~~
288	- .~~single~~-~~post~~ .amp-wp-~~article~~-content amp-~~img~~{ ~~margin~~:0 ~~auto~~ }
289	- }
290	- @media screen and (max-width: 1033px){
291	- .single-post figcaption{ margin: 0px 17px 5px -17px; }
292	- }
293	- @media screen and (max-width: 768px){ .amp-wp-meta{ margin:10px 0px 15px 0px } .home-post_image{ width: 40%; } .amp-loop-list .amp-wp-post-content{ width: 58%; } .amp-loop-list .featured_time{line-height:1} .single-post main .amp-wp-content h1{ line-height:1.4; font-size: 30px;} .single-post .alignright amp-img, .alignright figcaption{margin:0 -17px 0 17px} .alignnone figcaption{margin:0px -17px 5px -17px} }
294	@media screen and (max-width: 600px){ .amp-loop-list .amp-wp-tags{display:none} }
295	@media screen and (max-width: 530px){ .home-post_image{ width: 35%; } .amp-loop-list .amp-wp-post-content{ width: 63%; } .amp-wp-post-content p { font-size: 12px; } .related_posts ol li p { line-height: 1.6; margin: 7px 0 0 0;} .comments_list ul li .comment-body {width:auto} .amp-category-block li:nth-child(3) {margin:0} }
296	@media screen and (max-width: 425px){ .home-post_image{ /* width: 125px;/ width: 31.6%; overflow: hidden; height: 100px; / margin-right: 13px; */ margin-right: 3%; } .home-post_image amp-img{ width: 144%; left: -20%; } h2.amp-wp-title{ margin-bottom: 7px; line-height: 1.31578947; font-size: 19px; position:relative;top:-3px } h2.amp-wp-title a{ color:#262626} .amp-loop-list{padding:25px 15px 22px 15px} .amp-loop-list .amp-wp-post-content{ width: 63%; } .amp-loop-list .amp-wp-post-content p, .related_posts .related_link p{ display:none } .related_posts .related_link a{ font-size: 18px; line-height: 1.7; } .ampforwp-tax-category{ padding-bottom:0 } .amp-wp-byline{ padding:0 } .related_posts .related_link a{ font-size: 17px; line-height: 1.5; } .single-post main .amp-wp-content h1{ line-height: 1.3; font-size: 26px;} .icono-share{display:none} .ampforwp-social-icons amp-social-share{ margin-right: 3px;} main .amp-wp-content{ font-size: 16px; line-height: 26px;} .single-post .amp_author_area .amp_author_area_wrapper{font-size:13px;} .amp-category-post{ font-size:12px; color:#666 } }
	@@ -336,9 +336,6 @@ amp-user-notification button { background-color: <?php echo $redux_builder_amp[
336	<?php if( $redux_builder_amp['enable-single-social-icons'] == true && is_socialshare_or_socialsticky_enabled_in_ampforwp() ) { ?>
337	.single-post footer { padding-bottom: 41px;}
338	<?php } ?>
339	- .single-post .alignnone amp-img{ padding: 17px;margin-bottom:0px}
340	- .single-post amp-img.alignleft, amp-anim.alignleft{ margin-right: 15px; margin-bottom:5px; float: left;}
341	- .single-post amp-img.alignright, amp-anim.alignright{ float:right; margin: 0px -17px 17px 0; }
342	.amp-wp-author:before{ content: " <?php global $redux_builder_amp; echo ampforwp_translation($redux_builder_amp['amp-translator-published-by'], 'Published by' );?> ";}
343	.ampforwp-tax-category span:last-child:after { content: ' ';}
344	.ampforwp-tax-category span:after{ content: ', ';}
	@@ -409,6 +406,5 @@ if ( class_exists('TablePress') ) { ?>
409	@media (min-width: 768px) and (max-width: 1600px){ .tablepress{ overflow-x: none; } }
410	@media (min-width: 320px) and (max-width: 767px){ .tablepress{ display: inline-block; overflow-x: scroll; } }
411	<?php } ?>
412	- p.wp-caption-text{ text-align: center }
413
414	<?php echo $redux_builder_amp['css_editor']; } ?>


2	add_action('amp_post_template_css', 'ampforwp_additional_style_input_3');
3	function ampforwp_additional_style_input_3( $amp_template ) {
4	global $redux_builder_amp;
5	+ global $post;
6	+ $post_id = '';
7	+ $post_id = $post->ID;
8	$get_customizer = new AMP_Post_Template( $post_id );
9	// Get content width
10	$colorscheme = $redux_builder_amp['amp-opt-color-rgba-colorscheme']['color'];

124	/* Single */
125	.single-post main{ margin: 20px 17px 17px 17px; }
126	.amp-wp-article-content{ font-family:'PT Serif', serif; }
127	+ .single-post .post-featured-img{ margin:0 -17px 0px -17px }
128	+ .amp-wp-article-featured-image.wp-caption .wp-caption-text{color: #696969; font-size: 11px; line-height: 15px; background: #eee; margin: 0; padding: .66em .75em; text-align: center;}
129	.ampforwp-title{ padding: 0px 0px 0px 0px; margin-top: 12px; margin-bottom: 12px; }
130	.comment-button-wrapper{ margin-bottom: 50px; margin-top: 30px; text-align:center }
131	.comment-button-wrapper a{ color: #fff; background: #312c7e; font-size: 14px; padding: 12px 22px 12px 22px; font-family: 'Roboto Slab', serif; border-radius: 2px; text-transform: uppercase; letter-spacing: 1px; }

154	main .amp-wp-content.featured-image-content{ padding: 0px; border: 0; margin-bottom: 0; box-shadow: none }
155	.amp-wp-content .amp-wp-article-featured-image amp-img {margin: 0 auto;}
156	.archives_body main{ margin-top:30px }
157	+ .single-post .amp-wp-article-content amp-img{ max-width:100% }
158	/* Related Posts */
159	main .amp-wp-content.relatedpost{ background: none; box-shadow: none; padding:0px 0 0 0; margin:1.8em auto 1.5em auto }
160	.single-post ,.related-title,.single-post .comments_list h3{ font-size: 20px; color: #777; font-family:'Roboto Slab', serif; border-bottom: 1px solid #eee; font-weight: 400; padding-bottom: 1px; margin-bottom: 10px; }

289
290	/* Responsive */
291	@media screen and (min-width: 650px) { table {display: inline-table;} }
292	+
293	+ @media screen and (max-width: 768px){ .amp-wp-meta{ margin:10px 0px 15px 0px } .home-post_image{ width: 40%; } .amp-loop-list .amp-wp-post-content{ width: 58%; } .amp-loop-list .featured_time{line-height:1} .single-post main .amp-wp-content h1{ line-height:1.4; font-size: 30px;} }





294	@media screen and (max-width: 600px){ .amp-loop-list .amp-wp-tags{display:none} }
295	@media screen and (max-width: 530px){ .home-post_image{ width: 35%; } .amp-loop-list .amp-wp-post-content{ width: 63%; } .amp-wp-post-content p { font-size: 12px; } .related_posts ol li p { line-height: 1.6; margin: 7px 0 0 0;} .comments_list ul li .comment-body {width:auto} .amp-category-block li:nth-child(3) {margin:0} }
296	@media screen and (max-width: 425px){ .home-post_image{ /* width: 125px;/ width: 31.6%; overflow: hidden; height: 100px; / margin-right: 13px; */ margin-right: 3%; } .home-post_image amp-img{ width: 144%; left: -20%; } h2.amp-wp-title{ margin-bottom: 7px; line-height: 1.31578947; font-size: 19px; position:relative;top:-3px } h2.amp-wp-title a{ color:#262626} .amp-loop-list{padding:25px 15px 22px 15px} .amp-loop-list .amp-wp-post-content{ width: 63%; } .amp-loop-list .amp-wp-post-content p, .related_posts .related_link p{ display:none } .related_posts .related_link a{ font-size: 18px; line-height: 1.7; } .ampforwp-tax-category{ padding-bottom:0 } .amp-wp-byline{ padding:0 } .related_posts .related_link a{ font-size: 17px; line-height: 1.5; } .single-post main .amp-wp-content h1{ line-height: 1.3; font-size: 26px;} .icono-share{display:none} .ampforwp-social-icons amp-social-share{ margin-right: 3px;} main .amp-wp-content{ font-size: 16px; line-height: 26px;} .single-post .amp_author_area .amp_author_area_wrapper{font-size:13px;} .amp-category-post{ font-size:12px; color:#666 } }

336	<?php if( $redux_builder_amp['enable-single-social-icons'] == true && is_socialshare_or_socialsticky_enabled_in_ampforwp() ) { ?>
337	.single-post footer { padding-bottom: 41px;}
338	<?php } ?>



339	.amp-wp-author:before{ content: " <?php global $redux_builder_amp; echo ampforwp_translation($redux_builder_amp['amp-translator-published-by'], 'Published by' );?> ";}
340	.ampforwp-tax-category span:last-child:after { content: ' ';}
341	.ampforwp-tax-category span:after{ content: ', ';}

406	@media (min-width: 768px) and (max-width: 1600px){ .tablepress{ overflow-x: none; } }
407	@media (min-width: 320px) and (max-width: 767px){ .tablepress{ display: inline-block; overflow-x: scroll; } }
408	<?php } ?>

409
410	<?php echo $redux_builder_amp['css_editor']; } ?>

templates/features.php CHANGED Viewed

	@@ -199,8 +199,7 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
199	if ( is_home() \|\| is_front_page() \|\| is_archive() ){
200	global $wp;
201	$current_archive_url = home_url( $wp->request );
202	- $amp_url = trailingslashit($current_archive_url).'amp';
203	-
204	} else {
205	$amp_url = amp_get_permalink( get_queried_object_id() );
206	}
	@@ -219,7 +218,7 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
219	$supported_types[] = $custom_post;
220	}
221	}
222	- }
223
224	include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
225	if( is_plugin_active( 'amp-woocommerce/amp-woocommerce.php' ) ) {
	@@ -232,14 +231,8 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
232	$supported_amp_post_types = in_array( $type , $supported_types );
233
234	$query_arg_array = $wp->query_vars;
235	-
236	if( array_key_exists( 'paged' , $query_arg_array ) ) {
237	- if ( ( is_home() \|\| ~~is_front_page~~() ) && $wp->query_vars['paged'] >= '2' ) {
238	- $new_url = home_url('/');
239	- $new_url = $new_url . AMPFORWP_AMP_QUERY_VAR . '/' . $wp->request ;
240	- $amp_url = $new_url ;
241	- }
242	- if ( is_archive() && $wp->query_vars['paged'] >= '2' ) {
243	$new_url = home_url('/');
244	$category_path = $wp->request;
245	$explode_path = explode("/",$category_path);
	@@ -262,7 +255,7 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
262	$amp_url = apply_filters('ampforwp_modify_rel_canonical',$amp_url);
263
264	if( $supported_amp_post_types) {
265	- printf( '<link rel="amphtml" href="%s" />', esc_url( $amp_url ) );
266	}
267
268	}
	@@ -925,6 +918,8 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
925	// $content = preg_replace('/<img*/', '<amp-img', $content); // Fallback for plugins
926	// Removing the type attribute from the <ul>
927	$content = preg_replace('/<ul(.?)type=".?"(.*?)/','<ul $1',$content);


928	return $content;
929	}
930
	@@ -1082,7 +1077,7 @@ function ampforwp_get_all_post_types(){
1082	global $redux_builder_amp;
1083
1084	$post_types = array('post' => 'post', 'page' => 'page');
1085	- if ( $redux_builder_amp['ampforwp-custom-type'] ) {
1086	$post_types = array_merge($post_types, $redux_builder_amp['ampforwp-custom-type']);
1087	}
1088	return $post_types;
	@@ -1126,7 +1121,7 @@ function ampforwp_title_callback( $post ) {
1126
1127	// TODO: Move the data storage code, to Save meta Box area as it is not a good idea to update an option everytime, try adding this code inside ampforwp_title_meta_save()
1128	// This code needs a rewrite.
1129	- if ( $ampforwp_stored_meta['ampforwp-amp-on-off'][0] == 'hide-amp') {
1130	$exclude_post_value = get_option('ampforwp_exclude_post');
1131	if ( $exclude_post_value == null ) {
1132	$exclude_post_value[] = 0;
	@@ -1211,7 +1206,7 @@ function ampforwp_title_callback_redirection( $post ) {
1211
1212	// TODO: Move the data storage code, to Save meta Box area as it is not a good idea to update an option everytime, try adding this code inside ampforwp_title_meta_save()
1213	// This code needs a rewrite.
1214	- if ( $ampforwp_redirection_stored_meta['ampforwp-redirection-on-off'][0] == 'disable') {
1215	$exclude_post_value = get_option('ampforwp_exclude_post');
1216	if ( $exclude_post_value == null ) {
1217	$exclude_post_value[] = 0;
	@@ -1438,6 +1433,11 @@ function ampforwp_remove_schema_data() {
1438	ampforwp_remove_filters_for_class( 'the_content', 'ICWP_WPTB_CssProcessor_V1', 'run', 10 );
1439	//Perfect SEO url + Yoast SEO Compatibility #982
1440	ampforwp_remove_filters_for_class( 'wpseo_canonical', 'PSU', 'canonical', 10 );





1441	}
1442	//Removing the WPTouch Pro social share links from AMP
1443	remove_filter( 'the_content', 'foundation_handle_share_links_bottom', 100 );
	@@ -1538,9 +1538,13 @@ function ampforwp_custom_yoast_meta(){
1538	do_action( 'wpseo_opengraph' );
1539	}
1540	}//execute only if Glue is deactive
1541	- ~~echo strip_tags~~($redux_builder_amp['ampforwp-seo-custom-additional-meta'], '~~<link><~~meta>' );


1542	} else {
1543	- ~~echo strip_tags~~($redux_builder_amp['ampforwp-seo-custom-additional-meta'], '~~<link><~~meta>' );


1544	}
1545	}
1546
	@@ -1886,15 +1890,24 @@ add_action('wp','ampforwp_remove_crazy_lazy_support',9);
1886	add_action('init', 'amp_gtm_remove_analytics_code');
1887	function amp_gtm_remove_analytics_code() {
1888	global $redux_builder_amp;
1889	- if( $redux_builder_amp['amp-use-gtm-option'] ) {
1890	remove_action('amp_post_template_footer','ampforwp_analytics',11);
1891	remove_action('amp_post_template_head','ampforwp_register_analytics_script', 20);


1892	} else {
1893	remove_filter( 'amp_post_template_analytics', 'amp_gtm_add_gtm_support' );
1894
1895	}
1896	}
1897	-







1898	// Create GTM support
1899	add_filter( 'amp_post_template_analytics', 'amp_gtm_add_gtm_support' );
1900	function amp_gtm_add_gtm_support( $analytics ) {
	@@ -2175,7 +2188,7 @@ function ampforwp_add_widget_support() {
2175	'after_title' => '</h4>'
2176	));
2177
2178	- if ( $redux_builder_amp['ampforwp-content-builder'] ) {
2179	$desc = "Drag and Drop the AMP Modules in this Widget Area and then assign this widget area to a page <a href=http://ampforwp.com/tutorials/page-builder>(Need Help?)</a>";
2180	$placeholder = 'PLACEHOLDER';
2181	register_sidebar(array(
	@@ -2298,7 +2311,7 @@ function ampforwp_auto_add_amp_in_link_check() {
2298
2299	function ampforwp_auto_add_amp_in_menu_link( $atts, $item, $args ) {
2300
2301	- $atts['href'] = trailingslashit( $atts['href'] ) . AMPFORWP_AMP_QUERY_VAR;
2302	return $atts;
2303	}
2304
	@@ -2361,7 +2374,7 @@ function ampforwp_search_or_homepage_or_staticpage_metadata( $metadata, $post )
2361	'width' => $structured_data_width,
2362	);
2363
2364	- $metadata['mainEntityOfPage'] = $current_url; // proper URL added
2365	$metadata['headline'] = $headline; // proper headline added
2366	}
2367	return $metadata;
	@@ -2796,7 +2809,8 @@ function ampforwp_frontpage_comments() {
2796	$emoji_content = get_comment_text();
2797	// $emoji_free_comments = preg_replace($pattern,'',$emoji_content);
2798	$emoji_content = wpautop( $emoji_content );
2799	- $sanitizer = new AMPFORWP_Content( $emoji_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array() ~~) ) );~~

2800	$sanitized_comment_content = $sanitizer->get_amp_content();
2801	echo make_clickable( $sanitized_comment_content );
2802	?>
	@@ -2822,18 +2836,13 @@ function ampforwp_frontpage_comments() {
2822	</ul>
2823	</div>
2824	<?php
2825	- ~~if ( comments_open($postID) ) { ?>~~


2826	<div class="comment-button-wrapper">
2827	<a href="<?php echo esc_url( trailingslashit( $comment_button_url ) ) .'?nonamp=1'.'#commentform' ?>" rel="nofollow"><?php echo ampforwp_translation( $redux_builder_amp['amp-translator-leave-a-comment-text'], 'Leave a Comment' ); ?></a>
2828	</div><?php
2829	- }
2830	- } else {
2831	- if ( !comments_open() ) { ?>
2832	- <div class="comment-button-wrapper">
2833	- <a href="<?php echo esc_url( trailingslashit( $comment_button_url ) ) .'?nonamp=1'.'#commentform' ?>" rel="nofollow"><?php echo ampforwp_translation( $redux_builder_amp['amp-translator-leave-a-comment-text'], 'Leave a Comment' ); ?></a>
2834	- </div>
2835	- <?php }
2836	- }?>
2837	</div> <?php
2838	}
2839	}
	@@ -3057,7 +3066,7 @@ add_action('init', 'fb_instant_article_feed_generator');
3057
3058	function fb_instant_article_feed_generator() {
3059	global $redux_builder_amp;
3060	- if( $redux_builder_amp['fb-instant-article-switch'] ) {
3061	add_feed('instant_articles', 'fb_instant_article_feed_function');
3062	}
3063	}
	@@ -3071,7 +3080,7 @@ function fb_instant_article_feed_function() {
3071	function ampforwp_post_pagination( $args = '' ) {
3072
3073	wp_reset_postdata();
3074	- global $page, $numpages, $multipage, $more;
3075
3076	$defaults = array(
3077	'before' => '<p>' . __( 'Page:' ),
	@@ -3140,10 +3149,12 @@ function ampforwp_post_pagination( $args = '' ) {
3140	* @param array $args An array of arguments.
3141	*/
3142	$html = apply_filters( 'ampforwp_post_pagination', $output, $args );
3143	- if ( $r['~~echo~~'] ) {
3144	- echo ~~$html;~~
3145	- }
3146	- ~~return $html;~~


3147
3148	}
3149
	@@ -3288,41 +3299,34 @@ function ampforwp_rel_canonical_home_archive(){
3288	$amp_url = '';
3289	$remove = '';
3290	$query_arg_array = '';


3291
3292	- if ( is_home() ~~&& !$redux_builder_amp['amp-frontpage-select-option']~~ \|\| ( is_archive() && $redux_builder_amp['ampforwp-archive-support'] ) ){
3293	$current_archive_url = home_url( $wp->request );
3294	$amp_url = trailingslashit($current_archive_url);
3295	$remove = '/'. AMPFORWP_AMP_QUERY_VAR;
3296	- $amp_url = str_replace($remove, '', $amp_url) ~~;?>~~
3297	- <link rel="canonical" href="<?php echo $amp_url ?>">
3298	- <?php }
3299	-
3300	- if((is_front_page() \|\| is_home() ) && $redux_builder_amp['amp-frontpage-select-option'] ){
3301	$query_arg_array = $wp->query_vars;
3302	- $page = '' ;
3303	if( array_key_exists( "page" , $query_arg_array ) ) {
3304	$page = $wp->query_vars['page'];
3305	}
3306	- if ( $page >= '2') { ?>
3307	- ~~<link~~ ~~rel~~=~~"canonical"~~ ~~href~~=~~"<?php~~
3308	- ~~echo~~ ~~trailingslashit( home_url() ) . '?page=' . $page~~ ?>~~"> <?php~~
3309	- } ~~else~~ { ?>
3310	- ~~<link rel="canonical" href="~~<?php
3311	- ~~echo trailingslashit( home_url() ) ?>"> <?php~~
3312	- }
3313	- }
3314	}
3315
3316	- // 71. Alt tag for thumbnails #1013 ~~and For Post ID in Body tag #1006~~
3317	- //Alt tag for thumbnails #1013
3318	function ampforwp_thumbnail_alt(){
3319	$thumb_id = '';
3320	$thumb_alt = '';
3321	$thumb_id = get_post_thumbnail_id();
3322	- $thumb_alt = get_post_meta( $thumb_id, '_wp_attachment_image_alt', true);
3323	-
3324	- if($thumb_alt){
3325	- echo "alt = '$thumb_alt'";
3326	}
3327	}
3328	// For Post ID in Body tag #1006
	@@ -3450,3 +3454,15 @@ function ampforwp_generate_meta_desc(){
3450	}
3451	return $desc;
3452	}


199	if ( is_home() \|\| is_front_page() \|\| is_archive() ){
200	global $wp;
201	$current_archive_url = home_url( $wp->request );
202	+ $amp_url = trailingslashit(trailingslashit($current_archive_url).'amp');

203	} else {
204	$amp_url = amp_get_permalink( get_queried_object_id() );
205	}

218	$supported_types[] = $custom_post;
219	}
220	}
221	+ }
222
223	include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
224	if( is_plugin_active( 'amp-woocommerce/amp-woocommerce.php' ) ) {

231	$supported_amp_post_types = in_array( $type , $supported_types );
232
233	$query_arg_array = $wp->query_vars;

234	if( array_key_exists( 'paged' , $query_arg_array ) ) {
235	+ if ( (is_home() \|\| is_archive()) && $wp->query_vars['paged'] >= '2' ) {





236	$new_url = home_url('/');
237	$category_path = $wp->request;
238	$explode_path = explode("/",$category_path);

255	$amp_url = apply_filters('ampforwp_modify_rel_canonical',$amp_url);
256
257	if( $supported_amp_post_types) {
258	+ printf( '<link rel="amphtml" href="%s" />', esc_url(trailingslashit($amp_url) ));
259	}
260
261	}

918	// $content = preg_replace('/<img*/', '<amp-img', $content); // Fallback for plugins
919	// Removing the type attribute from the <ul>
920	$content = preg_replace('/<ul(.?)type=".?"(.*?)/','<ul $1',$content);
921	+ //Convert the Twitter embed into url for better sanitization #1010
922	+ $content = preg_replace('/<blockquote.+?(?=class="twitter-tweet")class="twitter-tweet".+?(https:\/\/twitter\.com\/\w+\/\w+\/.*?)".+?(?=<\/blockquote>)<\/blockquote>/s', "$1", $content);
923	return $content;
924	}
925

1077	global $redux_builder_amp;
1078
1079	$post_types = array('post' => 'post', 'page' => 'page');
1080	+ if ( isset($redux_builder_amp['ampforwp-custom-type']) && $redux_builder_amp['ampforwp-custom-type'] ) {
1081	$post_types = array_merge($post_types, $redux_builder_amp['ampforwp-custom-type']);
1082	}
1083	return $post_types;

1121
1122	// TODO: Move the data storage code, to Save meta Box area as it is not a good idea to update an option everytime, try adding this code inside ampforwp_title_meta_save()
1123	// This code needs a rewrite.
1124	+ if ( ! isset($ampforwp_stored_meta['ampforwp-amp-on-off'][0]) \|\| $ampforwp_stored_meta['ampforwp-amp-on-off'][0] == 'hide-amp') {
1125	$exclude_post_value = get_option('ampforwp_exclude_post');
1126	if ( $exclude_post_value == null ) {
1127	$exclude_post_value[] = 0;

1206
1207	// TODO: Move the data storage code, to Save meta Box area as it is not a good idea to update an option everytime, try adding this code inside ampforwp_title_meta_save()
1208	// This code needs a rewrite.
1209	+ if ( !isset($ampforwp_redirection_stored_meta['ampforwp-redirection-on-off'][0]) \|\| $ampforwp_redirection_stored_meta['ampforwp-redirection-on-off'][0] == 'disable') {
1210	$exclude_post_value = get_option('ampforwp_exclude_post');
1211	if ( $exclude_post_value == null ) {
1212	$exclude_post_value[] = 0;

1433	ampforwp_remove_filters_for_class( 'the_content', 'ICWP_WPTB_CssProcessor_V1', 'run', 10 );
1434	//Perfect SEO url + Yoast SEO Compatibility #982
1435	ampforwp_remove_filters_for_class( 'wpseo_canonical', 'PSU', 'canonical', 10 );
1436	+ //SiteOrigin Page builder compatibilty
1437	+ //Neglect SOPB If Custom AMP Editor is checked
1438	+ if ( $amp_custom_content_enable === 'yes') {
1439	+ ampforwp_remove_filters_for_class( 'the_content', 'SiteOrigin_Panels', 'generate_post_content', 10 );
1440	+ }
1441	}
1442	//Removing the WPTouch Pro social share links from AMP
1443	remove_filter( 'the_content', 'foundation_handle_share_links_bottom', 100 );

1538	do_action( 'wpseo_opengraph' );
1539	}
1540	}//execute only if Glue is deactive
1541	+ if(isset($redux_builder_amp['ampforwp-seo-custom-additional-meta']) && $redux_builder_amp['ampforwp-seo-custom-additional-meta']){
1542	+ echo strip_tags($redux_builder_amp['ampforwp-seo-custom-additional-meta'], '<link><meta>' );
1543	+ }
1544	} else {
1545	+ if(isset($redux_builder_amp['ampforwp-seo-custom-additional-meta']) && $redux_builder_amp['ampforwp-seo-custom-additional-meta']){
1546	+ echo strip_tags($redux_builder_amp['ampforwp-seo-custom-additional-meta'], '<link><meta>' );
1547	+ }
1548	}
1549	}
1550

1890	add_action('init', 'amp_gtm_remove_analytics_code');
1891	function amp_gtm_remove_analytics_code() {
1892	global $redux_builder_amp;
1893	+ if( isset($redux_builder_amp['amp-use-gtm-option']) && $redux_builder_amp['amp-use-gtm-option'] ) {
1894	remove_action('amp_post_template_footer','ampforwp_analytics',11);
1895	remove_action('amp_post_template_head','ampforwp_register_analytics_script', 20);
1896	+ //Add GTM Analytics code right after the body tag
1897	+ add_action('ampforwp_body_beginning','amp_post_template_add_analytics_data',10);
1898	} else {
1899	remove_filter( 'amp_post_template_analytics', 'amp_gtm_add_gtm_support' );
1900
1901	}
1902	}
1903	+ //Remove other analytics if GTM is enable
1904	+ add_action('amp_post_template_footer','ampforwp_gtm_support', 9);
1905	+ function ampforwp_gtm_support(){
1906	+ global $redux_builder_amp;
1907	+ if( isset($redux_builder_amp['amp-use-gtm-option']) && $redux_builder_amp['amp-use-gtm-option'] ) {
1908	+ remove_action( 'amp_post_template_footer', 'amp_post_template_add_analytics_data' );
1909	+ }
1910	+ }
1911	// Create GTM support
1912	add_filter( 'amp_post_template_analytics', 'amp_gtm_add_gtm_support' );
1913	function amp_gtm_add_gtm_support( $analytics ) {

2188	'after_title' => '</h4>'
2189	));
2190
2191	+ if ( isset($redux_builder_amp['ampforwp-content-builder']) && $redux_builder_amp['ampforwp-content-builder'] ) {
2192	$desc = "Drag and Drop the AMP Modules in this Widget Area and then assign this widget area to a page <a href=http://ampforwp.com/tutorials/page-builder>(Need Help?)</a>";
2193	$placeholder = 'PLACEHOLDER';
2194	register_sidebar(array(

2311
2312	function ampforwp_auto_add_amp_in_menu_link( $atts, $item, $args ) {
2313
2314	+ $atts['href'] = trailingslashit(trailingslashit( $atts['href'] ) . AMPFORWP_AMP_QUERY_VAR);
2315	return $atts;
2316	}
2317

2374	'width' => $structured_data_width,
2375	);
2376
2377	+ $metadata['mainEntityOfPage'] = trailingslashit($current_url); // proper URL added
2378	$metadata['headline'] = $headline; // proper headline added
2379	}
2380	return $metadata;

2809	$emoji_content = get_comment_text();
2810	// $emoji_free_comments = preg_replace($pattern,'',$emoji_content);
2811	$emoji_content = wpautop( $emoji_content );
2812	+ $sanitizer = new AMPFORWP_Content( $emoji_content, array(), apply_filters( 'ampforwp_content_sanitizers', array( 'AMP_Img_Sanitizer' => array(),
2813	+ 'AMP_Video_Sanitizer' => array() ) ) );
2814	$sanitized_comment_content = $sanitizer->get_amp_content();
2815	echo make_clickable( $sanitized_comment_content );
2816	?>

2836	</ul>
2837	</div>
2838	<?php
2839	+
2840	+ }
2841	+ if ( comments_open($postID) ) { ?>
2842	<div class="comment-button-wrapper">
2843	<a href="<?php echo esc_url( trailingslashit( $comment_button_url ) ) .'?nonamp=1'.'#commentform' ?>" rel="nofollow"><?php echo ampforwp_translation( $redux_builder_amp['amp-translator-leave-a-comment-text'], 'Leave a Comment' ); ?></a>
2844	</div><?php
2845	+ }?>







2846	</div> <?php
2847	}
2848	}

3066
3067	function fb_instant_article_feed_generator() {
3068	global $redux_builder_amp;
3069	+ if( isset($redux_builder_amp['fb-instant-article-switch']) && $redux_builder_amp['fb-instant-article-switch'] ) {
3070	add_feed('instant_articles', 'fb_instant_article_feed_function');
3071	}
3072	}

3080	function ampforwp_post_pagination( $args = '' ) {
3081
3082	wp_reset_postdata();
3083	+ global $page, $numpages, $multipage, $more, $redux_builder_amp;
3084
3085	$defaults = array(
3086	'before' => '<p>' . __( 'Page:' ),

3149	* @param array $args An array of arguments.
3150	*/
3151	$html = apply_filters( 'ampforwp_post_pagination', $output, $args );
3152	+ if($redux_builder_amp['amp-pagination']) {
3153	+ if ( $r['echo'] ) {
3154	+ echo $html;
3155	+ }
3156	+ return $html;
3157	+ }
3158
3159	}
3160

3299	$amp_url = '';
3300	$remove = '';
3301	$query_arg_array = '';
3302	+ $page = '' ;
3303	+
3304
3305	+ if ( is_home() \|\| is_front_page() \|\| is_archive() && $redux_builder_amp['ampforwp-archive-support'] ) {
3306	$current_archive_url = home_url( $wp->request );
3307	$amp_url = trailingslashit($current_archive_url);
3308	$remove = '/'. AMPFORWP_AMP_QUERY_VAR;
3309	+ $amp_url = str_replace($remove, '', $amp_url);




3310	$query_arg_array = $wp->query_vars;

3311	if( array_key_exists( "page" , $query_arg_array ) ) {
3312	$page = $wp->query_vars['page'];
3313	}
3314	+ if ( $page >= '2') {
3315	+ $amp_url = trailingslashit( $amp_url . '?page=' . $page);
3316	+ } ?>
3317	+ <link rel="canonical" href="<?php echo trailingslashit($amp_url) ?>">
3318	+ <?php }
3319	+


3320	}
3321
3322	+ // 71. Alt tag for thumbnails #1013

3323	function ampforwp_thumbnail_alt(){
3324	$thumb_id = '';
3325	$thumb_alt = '';
3326	$thumb_id = get_post_thumbnail_id();
3327	+ $thumb_alt = get_post_meta( $thumb_id, '_wp_attachment_image_alt', true) ;
3328	+ if($thumb_alt){
3329	+ echo 'alt = "'. esc_attr($thumb_alt). '"';

3330	}
3331	}
3332	// For Post ID in Body tag #1006

3454	}
3455	return $desc;
3456	}
3457	+
3458	+ //Compatibility with WP User Avatar #975
3459	+ function ampforwp_get_wp_user_avatar(){
3460	+ include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
3461	+ if(is_plugin_active( 'wp-user-avatar/wp-user-avatar.php' )){
3462	+ if(class_exists('WP_User_Avatar_Functions')){
3463	+ $user_avatar_url = '';
3464	+ $user_avatar_url = get_wp_user_avatar_src();
3465	+ return $user_avatar_url;
3466	+ }
3467	+ }
3468	+ }

templates/frontpage-elements.php CHANGED Viewed

	@@ -44,9 +44,18 @@ function ampforwp_design_1_frontpage_content( $template, $post_id ){
44
45	<?php if (has_post_thumbnail( $post_id ) ): ?>
46	<figure class="amp-wp-article-featured-image wp-caption"> <?php
47	- $~~image~~ = ~~wp_get_attachment_image_src(~~ get_post_thumbnail_id( $post_id )~~, 'medium' )~~;
48	- $~~caption~~ = ~~get_the_post_thumbnail_caption~~( $~~post_id~~ ); ?>
49	- ~~<amp-img src="<?php echo~~ $~~image[0];~~ ~~?>" width~~=~~"<?php~~ ~~echo $image[1]; ?>" height="<?php echo $image[2]; ?>" layout=responsive alt="<?php echo get_the_title~~( $post_id ) ~~?>" > </amp-img>~~









50	<?php if ( $caption ) : ?>
51	<p class="wp-caption-text">
52	<?php echo wp_kses_data( $caption ); ?>
	@@ -90,9 +99,17 @@ function ampforwp_design_2_frontpage_content($template, $post_id){
90
91	<?php if (has_post_thumbnail( $post_id ) ): ?>
92	<figure class="amp-wp-article-featured-image wp-caption"> <?php
93	- $~~image~~ = ~~wp_get_attachment_image_src(~~ get_post_thumbnail_id( $post_id )~~, 'medium' )~~;








94	$caption = get_the_post_thumbnail_caption( $post_id ); ?>
95	- <amp-img src="<?php echo $image[0]; ?>" width="<?php echo $image[1]; ?>" height="<?php echo $image[2]; ?>" layout=responsive alt="<?php echo ~~get_the_title~~( $~~post_id~~ ) ?>" > </amp-img>
96	<?php if ( $caption ) : ?>
97	<p class="wp-caption-text">
98	<?php echo wp_kses_data( $caption ); ?>
	@@ -133,10 +150,18 @@ function ampforwp_design_3_frontpage_content($template, $post_id){
133	<div class="amp-wp-content the_content">
134
135	<?php if (has_post_thumbnail( $post_id ) ): ?>
136	- <figure class="amp-wp-article-featured-image wp-caption"> <?php
137	- $~~image~~ = ~~wp_get_attachment_image_src(~~ get_post_thumbnail_id( $post_id )~~, 'medium' )~~;








138	$caption = get_the_post_thumbnail_caption( $post_id ); ?>
139	- <amp-img src="<?php echo $image[0]; ?>" width="<?php echo $image[1]; ?>" height="<?php echo $image[2]; ?>" layout=responsive alt="<?php echo ~~get_the_title~~( $~~post_id~~ ) ?>" > </amp-img>
140	<?php if ( $caption ) : ?>
141	<p class="wp-caption-text">
142	<?php echo wp_kses_data( $caption ); ?>


44
45	<?php if (has_post_thumbnail( $post_id ) ): ?>
46	<figure class="amp-wp-article-featured-image wp-caption"> <?php
47	+ $thumb_id = get_post_thumbnail_id($post_id);
48	+ $image = wp_get_attachment_image_src( $thumb_id, 'full' );
49	+ $caption = get_the_post_thumbnail_caption( $post_id );
50	+ $thumb_alt = get_post_meta( $thumb_id, '_wp_attachment_image_alt', true);
51	+ if($thumb_alt){
52	+ $alt = $thumb_alt;
53	+ }
54	+ else{
55	+ $alt = get_the_title( $post_id );
56	+ }
57	+ ?>
58	+ <amp-img src="<?php echo $image[0]; ?>" width="<?php echo $image[1]; ?>" height="<?php echo $image[2]; ?>" layout=responsive alt="<?php echo esc_attr($alt); ?>" > </amp-img>
59	<?php if ( $caption ) : ?>
60	<p class="wp-caption-text">
61	<?php echo wp_kses_data( $caption ); ?>

99
100	<?php if (has_post_thumbnail( $post_id ) ): ?>
101	<figure class="amp-wp-article-featured-image wp-caption"> <?php
102	+ $thumb_id = get_post_thumbnail_id($post_id);
103	+ $thumb_alt = get_post_meta( $thumb_id, '_wp_attachment_image_alt', true);
104	+ if($thumb_alt){
105	+ $alt = $thumb_alt;
106	+ }
107	+ else{
108	+ $alt = get_the_title( $post_id );
109	+ }
110	+ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), 'full' );
111	$caption = get_the_post_thumbnail_caption( $post_id ); ?>
112	+ <amp-img src="<?php echo $image[0]; ?>" width="<?php echo $image[1]; ?>" height="<?php echo $image[2]; ?>" layout=responsive alt="<?php echo esc_attr($alt); ?>" > </amp-img>
113	<?php if ( $caption ) : ?>
114	<p class="wp-caption-text">
115	<?php echo wp_kses_data( $caption ); ?>

150	<div class="amp-wp-content the_content">
151
152	<?php if (has_post_thumbnail( $post_id ) ): ?>
153	+ <figure class="amp-wp-article-featured-image wp-caption"> <?php
154	+ $thumb_id = get_post_thumbnail_id($post_id);
155	+ $thumb_alt = get_post_meta( $thumb_id, '_wp_attachment_image_alt', true);
156	+ if($thumb_alt){
157	+ $alt = $thumb_alt;
158	+ }
159	+ else{
160	+ $alt = get_the_title( $post_id );
161	+ }
162	+ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post_id ), 'full' );
163	$caption = get_the_post_thumbnail_caption( $post_id ); ?>
164	+ <amp-img src="<?php echo $image[0]; ?>" width="<?php echo $image[1]; ?>" height="<?php echo $image[2]; ?>" layout=responsive alt="<?php echo esc_attr($alt); ?>" > </amp-img>
165	<?php if ( $caption ) : ?>
166	<p class="wp-caption-text">
167	<?php echo wp_kses_data( $caption ); ?>

templates/report-bugs.php CHANGED Viewed

	@@ -3,7 +3,7 @@ if ( ! function_exists( 'ampforwp_reporting_bugs' ) ) {
3	function ampforwp_reporting_bugs($sections){
4
5	$sections[] = array(
6	- 'title' => __( '~~Report~~ ~~an Issue /<br> Request a Feature~~', 'accelerated-mobile-pages' ),
7	// 'id' => 'opt-structured-data',
8	// 'subsection' => true,
9	'icon' => 'el el-warning-sign ',


3	function ampforwp_reporting_bugs($sections){
4
5	$sections[] = array(
6	+ 'title' => __( 'Send Feedback', 'accelerated-mobile-pages' ),
7	// 'id' => 'opt-structured-data',
8	// 'subsection' => true,
9	'icon' => 'el el-warning-sign ',

templates/search-functions.php CHANGED Viewed

	@@ -71,7 +71,7 @@ function ampforwp_get_search_form() {
71	if ( is_search_enabled_in_ampforwp() ) {
72	global $redux_builder_amp;
73	$action_url = '';
74	- $label = ampforwp_translation($redux_builder_amp['ampforwp-search-label'], 'Type your search query and hit enter');
75	$action_url = esc_url( get_bloginfo('url') );
76	$action_url = preg_replace('#^http?:#', '', $action_url);
77	$placeholder = ampforwp_translation($redux_builder_amp['ampforwp-search-placeholder'], 'Type Here' );


71	if ( is_search_enabled_in_ampforwp() ) {
72	global $redux_builder_amp;
73	$action_url = '';
74	+ $label = ampforwp_translation(isset($redux_builder_amp['ampforwp-search-label']) && $redux_builder_amp['ampforwp-search-label'], 'Type your search query and hit enter');
75	$action_url = esc_url( get_bloginfo('url') );
76	$action_url = preg_replace('#^http?:#', '', $action_url);
77	$placeholder = ampforwp_translation($redux_builder_amp['ampforwp-search-placeholder'], 'Type Here' );

AMP for WP – Accelerated Mobile Pages - Version 0.9.59

Version Description

Release Info

Code changes from version 0.9.58.1 to 0.9.59