AMP for WP – Accelerated Mobile Pages - Version 0.9.2.1

Version Description

[24th December 2016] = * Proper Details at https://ampforwp.com/step-towards-fixing-amp-validation-errors/ * Disabled the Tags and Categories support for AMP for better validation until we find a better solution. * Mobile redirection bug fixed, It was continuously redirecting to the same page [Bug fix] * trailingslashit added to make sure we have proper url for Mobile redirection [Bug fix] * In content AD overlapping the content issue fixed

Download this release

Release Info

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

Code changes from version 0.9.2 to 0.9.2.1

Files changed (9) hide show
  1. README.md +8 -1
  2. accelerated-moblie-pages.php +35 -17
  3. readme.txt +30 -41
  4. templates/design-manager/design-1/elements/meta-taxonomy.php +3 -3
  5. templates/design-manager/design-1/style.php +7 -4
  6. templates/design-manager/design-2/elements/meta-info.php +2 -2
  7. templates/design-manager/design-2/elements/meta-taxonomy.php +1 -1
  8. templates/design-manager/design-2/style.php +11 -4
  9. templates/features.php +2 -4
README.md CHANGED
@@ -7,7 +7,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
7
  Donate link: https://www.paypal.me/Kaludi/5
8
  Requires at least: 3.0
9
  Tested up to: 4.7
10
- Stable tag: 0.9.2
11
  License: GPLv2 or later
12
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
 
@@ -142,6 +142,13 @@ Please check if you have "Pretty Permalinks" enabled. If not then activate it. F
142
 
143
  == Changelog ==
144
 
 
 
 
 
 
 
 
145
  = 0.9.2 [23th December 2016] =
146
  * Proper Details at https://ampforwp.com/mobile-redirection/
147
  * AMP Mobile Redirection Feature added. It can be turned on from Dashboard > General and then Mobile Redirection. [New Feature]
7
  Donate link: https://www.paypal.me/Kaludi/5
8
  Requires at least: 3.0
9
  Tested up to: 4.7
10
+ Stable tag: 0.9.2.1
11
  License: GPLv2 or later
12
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
13
 
142
 
143
  == Changelog ==
144
 
145
+ = 0.9.2.1 [24th December 2016] =
146
+ * Proper Details at https://ampforwp.com/step-towards-fixing-amp-validation-errors/
147
+ * Disabled the Tags and Categories support for AMP for better validation until we find a better solution.
148
+ * Mobile redirection bug fixed, It was continuously redirecting to the same page [Bug fix]
149
+ * trailingslashit added to make sure we have proper url for Mobile redirection [Bug fix]
150
+ * In content AD overlapping the content issue fixed
151
+
152
  = 0.9.2 [23th December 2016] =
153
  * Proper Details at https://ampforwp.com/mobile-redirection/
154
  * AMP Mobile Redirection Feature added. It can be turned on from Dashboard > General and then Mobile Redirection. [New Feature]
accelerated-moblie-pages.php CHANGED
@@ -3,12 +3,13 @@
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.2
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: http://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/5
10
  License: GPL2
11
  */
 
12
  // Exit if accessed directly.
13
  if ( ! defined( 'ABSPATH' ) ) exit;
14
 
@@ -25,7 +26,7 @@ add_action( 'init', 'ampforwp_add_custom_post_support',11);
25
 
26
  define('AMPFORWP_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
27
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
28
- define('AMPFORWP_VERSION','0.9.2');
29
 
30
  /*
31
  * Load Files only in the backend
@@ -94,21 +95,38 @@ add_action('init','ampforwp_plugin_init',9);
94
 
95
  function ampforwp_page_template_redirect() {
96
  global $redux_builder_amp;
97
- if($redux_builder_amp['amp-mobile-redirection']){
98
- if ( wp_is_mobile() ) {
99
- if ( is_amp_endpoint() ){
100
- return;
101
- } else {
102
- if ( is_home() ) {
103
- wp_redirect( home_url('/') . AMP_QUERY_VAR . '/', 301 );
104
- } elseif ( is_archive() ) {
105
- return;
106
- } else {
107
- wp_redirect( get_permalink( $id ) . AMP_QUERY_VAR . '/', 301 );
108
- }
109
- }
110
- exit();
111
  }
112
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
113
  }
114
- add_action( 'template_redirect', 'ampforwp_page_template_redirect' );
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.2.1
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: http://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/5
10
  License: GPL2
11
  */
12
+
13
  // Exit if accessed directly.
14
  if ( ! defined( 'ABSPATH' ) ) exit;
15
 
26
 
27
  define('AMPFORWP_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
28
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
29
+ define('AMPFORWP_VERSION','0.9.2.1');
30
 
31
  /*
32
  * Load Files only in the backend
95
 
96
  function ampforwp_page_template_redirect() {
97
  global $redux_builder_amp;
98
+ if($redux_builder_amp['amp-mobile-redirection']){
99
+ if ( wp_is_mobile() ) {
100
+ if ( is_amp_endpoint() ) {
101
+ return;
102
+ } else {
103
+ if ( is_home() ) {
104
+ wp_redirect( trailingslashit( esc_url( home_url() ) ) .'?'. AMP_QUERY_VAR , 301 );
105
+ exit();
106
+ } elseif ( is_archive() ) {
107
+ return ;
108
+ } else {
109
+ wp_redirect( trailingslashit( esc_url( ( get_permalink( $id ) ) ) ) . AMP_QUERY_VAR , 301 );
110
+ exit();
111
+ }
112
  }
113
  }
114
+ }
115
+ }
116
+
117
+ add_action( 'template_redirect', 'ampforwp_page_template_redirect', 30 );
118
+ add_action( 'template_redirect', 'ampforwp_page_template_redirect_archive', 10 );
119
+
120
+ function ampforwp_page_template_redirect_archive() {
121
+
122
+ if( is_archive() ) {
123
+ if ( is_amp_endpoint() ) {
124
+ global $wp;
125
+ $archive_current_url = add_query_arg( '', '', home_url( $wp->request ) );
126
+ $archive_current_url = trailingslashit($archive_current_url );
127
+ wp_redirect( esc_url( $archive_current_url ) , 301 );
128
+ exit();
129
+ }
130
+ }
131
+
132
  }
 
readme.txt CHANGED
@@ -4,24 +4,25 @@ 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.7
7
- Stable tag: 0.9.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
11
  The Must have AMP plugin for WordPress. Automatically add Accelerated Mobile Pages (Google AMP Project) functionality on your WordPress site.
12
 
13
  == Description ==
14
- Automatically add Accelerated Mobile Pages (Google AMP Project) functionality on your WordPress site. AMP WP is a plugin that needs to no configuration, just activate it and you are done.
15
 
16
- [What's New in this Version?](http://ampforwp.com/new/) | [Priority Support](http://ampforwp.com/priority-support/) | [View Demo](http://ampforwp.com/demo/?amp) | [Screenshots](https://wordpress.org/plugins/accelerated-mobile-pages/screenshots/) | [Community](http://ampforwp.com/community/)
17
 
 
18
 
19
  > <strong>Extensions</strong><br>
20
- > Some useful extensions to extend AMP features, check [AMP Adsense Support](https://ampforwp.com/advanced-amp-ads/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin), [Custom Post Type Support](https://ampforwp.com/custom-post-type/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin) and [DoubleClick Support](https://ampforwp.com/doubleclick-for-publishers/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin). To view more, go to our [Extensions page](https://ampforwp.com/extensions/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin).
21
  >
22
  > <strong>Premium Support</strong><br>
23
- > We try our best to provide support on WordPress.org forums. However, One-on-one email support is available to people who bought the [Priority Support](https://ampforwp.com/priority-support/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin) only.
24
- >
25
  > <strong>Bug Reports</strong><br>
26
  > Bug reports for AMP for WP are [welcomed on GitHub](https://github.com/ahmedkaludi/Accelerated-Mobile-Pages). Please note GitHub is _not_ a support forum, and issues that aren't properly qualified as bugs will be closed.
27
 
@@ -68,20 +69,22 @@ Automatically add Accelerated Mobile Pages (Google AMP Project) functionality on
68
  * Piwik & Segment.com Support
69
  * Great Support & Active Development.
70
 
71
- [youtube https://www.youtube.com/watch?v=zzRy6Q_VGGc]
72
 
 
73
 
74
- **NOTE:** Next Update of this plugin will be released by end of Dec 2016.
 
75
 
 
76
 
77
- **[JOIN CHAT GROUP COMMUNITY](http://ampforwp.com/community/)**: Purpose of this group is to get proper suggestions and feedback from plugin users and the community so that we can make the plugin even better.
78
 
79
- **How to test if AMP is working or not?**
80
- After you install the plugin, Google will automatically index the amp pages using the amp tag and then show you the updates in the search console.
81
 
82
- **How can I view the AMP version of my site**
83
- To view the AMP version, add /?amp at the end of your url. An example would be http://Website.com/?amp .... and No, you don't have to worry about duplication of the content because that has been taken care of the canonical tag as suggested by Google.
84
 
 
85
  **How do I Report Bugs and Suggest New Features**
86
  <i>You</i> can report the bugs at https://github.com/ahmedkaludi/Accelerated-Mobile-Pages/issues
87
 
@@ -99,34 +102,7 @@ You can contact me using this url: http://ampforwp.com/contact/
99
 
100
 
101
  == Frequently Asked Questions ==
102
- = How to Setup Navigation Menu? =
103
- We have created a Seperate Navigation menu for AMP version which you can setup from the WordPress Menus, then navigate to Menu Locations, their you will notice AMP Menu. You can assign existing menus to this locations.
104
-
105
- = I added /?amp on the end of one of my URLs and a minimalist version of my page appeared. It looks just like on one of your screenshots, so I guess its installed properly. Okay what now? Is it just enough to install it and the plugin will do the rest? =
106
-
107
- After you see the minimalist view if you use the url with ?amp then it means that it has been installed properly. You dont need any extra steps to enable it.
108
-
109
- = The plugin supposed to redirect all mobile visitors to AMP version of site or not? =
110
- When you view the website from the mobile, it is not supposed to redirect you to the amp version, amp version is always ready for google in the backend, if Google wants to serve to the people, then it will get the amp version and serve to the customers.
111
-
112
- = I am worried that it will cause Duplicate content? =
113
- In the AMP version, we are using Canonical tag to solve this. I am 100% sure that using this plugin will not duplicate the content.
114
-
115
- = How do I know that my site is AMP enabled? =
116
- Add /?amp at the end of your website url and you will get amp version of your website.
117
-
118
- = I have addded /?amp at the end of the url and still I am not able to see the AMP version of my site? =
119
- Please check if you have "Pretty Permalinks" enabled. If not then activate it.
120
-
121
- = How do I report Bug reports? =
122
- Before you submit a new bug, please check if there already is an existing bug report for it. If so, it may be far more valuable to add to the existing one, than to create a new bug report. You can submit bug reports and feature requests at GitHub Issues Page.
123
-
124
- = How do I know that my site is AMP enabled? =
125
- Add /?amp at the end of your website url and you will get amp version of your website.
126
-
127
- = I have addded /?amp at the end of the url and still I'm not able to see the AMP version of my site? =
128
- Please check if you have "Pretty Permalinks" enabled. If not then activate it. For more details about Pretty Permalinks check out this wonderful article https://codex.wordpress.org/Using_Permalinks
129
-
130
 
131
 
132
  == Screenshots ==
@@ -135,10 +111,23 @@ Please check if you have "Pretty Permalinks" enabled. If not then activate it. F
135
  3. Post Navigation in Single
136
  4. Sticky Social sharing icons
137
  5. Overlay Navigation menu sidebar.
 
 
 
 
 
 
138
 
139
 
140
  == Changelog ==
141
 
 
 
 
 
 
 
 
142
  = 0.9.2 [23th December 2016] =
143
  * Proper Details at https://ampforwp.com/mobile-redirection/
144
  * AMP Mobile Redirection Feature added. It can be turned on from Dashboard > General and then Mobile Redirection. [New Feature]
4
  Donate link: https://www.paypal.me/Kaludi/5
5
  Requires at least: 3.0
6
  Tested up to: 4.7
7
+ Stable tag: 0.9.2.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
11
  The Must have AMP plugin for WordPress. Automatically add Accelerated Mobile Pages (Google AMP Project) functionality on your WordPress site.
12
 
13
  == Description ==
14
+ Automatically add Accelerated Mobile Pages (Google AMP Project) functionality on your WordPress site. AMP makes your website faster for Mobile visitors.
15
 
16
+ [What's New in this Version?](http://ampforwp.com/new/) | [Priority Support](https://ampforwp.com/priority-support/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin) | [View Demo](https://demo.ampforwp.com/amp/) | [Screenshots](https://wordpress.org/plugins/accelerated-mobile-pages/screenshots/) | [Community](http://ampforwp.com/community/)
17
 
18
+ [youtube https://www.youtube.com/watch?v=zzRy6Q_VGGc]
19
 
20
  > <strong>Extensions</strong><br>
21
+ > Some useful extensions to extend AMP features, check [AMP Adsense Support](https://ampforwp.com/advanced-amp-ads/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin), [Custom Post Type Support](https://ampforwp.com/custom-post-type/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin) and [DoubleClick Support](https://ampforwp.com/doubleclick-for-publishers/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin). To view more, go to our [Extensions page](https://ampforwp.com/extensions/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin).
22
  >
23
  > <strong>Premium Support</strong><br>
24
+ > We try our best to provide support on WordPress.org forums. However, One-on-one email support is available to people who bought the [Priority Support](https://ampforwp.com/priority-support/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin) only.
25
+ >
26
  > <strong>Bug Reports</strong><br>
27
  > Bug reports for AMP for WP are [welcomed on GitHub](https://github.com/ahmedkaludi/Accelerated-Mobile-Pages). Please note GitHub is _not_ a support forum, and issues that aren't properly qualified as bugs will be closed.
28
 
69
  * Piwik & Segment.com Support
70
  * Great Support & Active Development.
71
 
72
+ **NOTE:** Next Update of this plugin will be released by end of Dec 2016.
73
 
74
+ **[JOIN CHAT GROUP COMMUNITY](http://ampforwp.com/community/)**: Purpose of this group is to get proper suggestions and feedback from plugin users and the community so that we can make the plugin even better.
75
 
76
+ = Getting Started: =
77
+ **[1. User Documentation:](http://ampforwp.com/help/)**: The AMP for WP plugin is easy to setup but we have some tutorials and guides prepared for you which will help you dive deep with the plugin.
78
 
79
+ **[2. Developer Docs:](https://ampforwp.com/help/#extend)**: We have created special documentations for developers and semi technical users who are willing to modify the plugin according to their own needs.
80
 
81
+ **[3. Fixing AMP Validation Errors:](https://ampforwp.com/priority-support/#utm_source=wp_org&utm_medium=description-tab-pro-box&utm_campaign=AMP%20Plugin)**: We will personally take care that your website’s AMP version is perfectly validated. We will make sure that your AMP version gets approved and indexed by Google Webmaster Tools properly and we will even keep an eye on AMP updates from Google and implement them into your website.
82
 
83
+ **[4. Community Support Forum:](https://ampforwp.com/help/#support-forum)**: We have a special community support forum where you can ask us questions and get help about your AMP related questions. Delivering a good user experience means alot to us and so we try our best to reply each and every question that gets asked.
 
84
 
85
+ **[5. Frequently Asked Questions:](http://ampforwp.com/faq/)**: Some of the Frequently Asked questions.
 
86
 
87
+ = Issues & Bug Reports: =
88
  **How do I Report Bugs and Suggest New Features**
89
  <i>You</i> can report the bugs at https://github.com/ahmedkaludi/Accelerated-Mobile-Pages/issues
90
 
102
 
103
 
104
  == Frequently Asked Questions ==
105
+ **[View The Full FAQ at:](http://ampforwp.com/faq/)**
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
106
 
107
 
108
  == Screenshots ==
111
  3. Post Navigation in Single
112
  4. Sticky Social sharing icons
113
  5. Overlay Navigation menu sidebar.
114
+ 6. Page builder of the Single article. You can drag and drop any element.
115
+ 7. Single post of Design One
116
+ 8. GTMetrix Performance Report
117
+ 9. Google PageSpeed Insight report for AMP
118
+ 10. Homepage of Design One
119
+ 11. Pingdom Speed Report for AMP
120
 
121
 
122
  == Changelog ==
123
 
124
+ = 0.9.2.1 [24th December 2016] =
125
+ * Proper Details at https://ampforwp.com/step-towards-fixing-amp-validation-errors/
126
+ * Disabled the Tags and Categories support for AMP for better validation until we find a better solution.
127
+ * Mobile redirection bug fixed, It was continuously redirecting to the same page [Bug fix]
128
+ * trailingslashit added to make sure we have proper url for Mobile redirection [Bug fix]
129
+ * In content AD overlapping the content issue fixed
130
+
131
  = 0.9.2 [23th December 2016] =
132
  * Proper Details at https://ampforwp.com/mobile-redirection/
133
  * AMP Mobile Redirection Feature added. It can be turned on from Dashboard > General and then Mobile Redirection. [New Feature]
templates/design-manager/design-1/elements/meta-taxonomy.php CHANGED
@@ -7,7 +7,7 @@
7
  <div class="amp-wp-meta amp-wp-tax-category">
8
  <span><?php global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-categories-text'] .' ', 'amp' )); ?></span>
9
  <?php foreach ($ampforwp_categories as $cat ) {
10
- echo (' <a href="'.trailingslashit(get_category_link($cat->term_taxonomy_id)).'?'. AMP_QUERY_VAR .'" > '. $cat->name .'</a>');
11
  } ?>
12
  </div>
13
  <?php endif; ?>
@@ -19,8 +19,8 @@
19
  <?php if($redux_builder_amp['amp-rtl-select-option']==0) {
20
  global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-tags-text'] .' ', 'amp' ));
21
  }
22
- foreach ($ampforwp_tags as $tag) {
23
- echo ('<a href="'.trailingslashit(get_tag_link($tag->term_taxonomy_id)).'?amp" >'.$tag->name .'</a>');
24
  }
25
  if($redux_builder_amp['amp-rtl-select-option']) {
26
  global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-tags-text'] .' ', 'amp' ));
7
  <div class="amp-wp-meta amp-wp-tax-category">
8
  <span><?php global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-categories-text'] .' ', 'amp' )); ?></span>
9
  <?php foreach ($ampforwp_categories as $cat ) {
10
+ echo '<span>'. $cat->name .'</span>';
11
  } ?>
12
  </div>
13
  <?php endif; ?>
19
  <?php if($redux_builder_amp['amp-rtl-select-option']==0) {
20
  global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-tags-text'] .' ', 'amp' ));
21
  }
22
+ foreach ($ampforwp_tags as $tag) {
23
+ echo '<span>'. $tag->name .'</span>';
24
  }
25
  if($redux_builder_amp['amp-rtl-select-option']) {
26
  global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-tags-text'] .' ', 'amp' ));
templates/design-manager/design-1/style.php CHANGED
@@ -762,12 +762,15 @@ amp-carousel > amp-img > img {
762
  }
763
  .amp-wp-author:before{
764
  }
765
- .amp-wp-tax-category a:after,
766
- .amp-wp-tax-tag a:after {
 
 
 
767
  content: ', ';
768
  }
769
- .amp-wp-tax-category a:last-child:after,
770
- .amp-wp-tax-tag a:last-child:after {
771
  content: ' ';
772
  }
773
 
762
  }
763
  .amp-wp-author:before{
764
  }
765
+ .amp-wp-tax-category span:first-child:after {
766
+ content: ' ';
767
+ }
768
+ .amp-wp-tax-category span:after,
769
+ .amp-wp-tax-tag span:after {
770
  content: ', ';
771
  }
772
+ .amp-wp-tax-category span:last-child:after,
773
+ .amp-wp-tax-tag span:last-child:after {
774
  content: ' ';
775
  }
776
 
templates/design-manager/design-2/elements/meta-info.php CHANGED
@@ -28,8 +28,8 @@
28
  }
29
  ?>
30
  </span>
31
- <?php foreach ($ampforwp_categories as $cat ) {
32
- echo ('<a href="'.trailingslashit(get_category_link($cat->term_taxonomy_id)).'?amp" >'.$cat->name .'</a>');
33
  }
34
 
35
  //if RTL is ON
28
  }
29
  ?>
30
  </span>
31
+ <?php foreach ($ampforwp_categories as $cat ) {
32
+ echo '<span>'. $cat->name .'</span>';
33
  }
34
 
35
  //if RTL is ON
templates/design-manager/design-2/elements/meta-taxonomy.php CHANGED
@@ -10,7 +10,7 @@
10
  }
11
 
12
  foreach ($ampforwp_tags as $tag) {
13
- echo ('<a href="'.trailingslashit(get_tag_link($tag->term_taxonomy_id)).'?amp" >'.$tag->name .'</a>');
14
  }
15
 
16
  //if RTL is ON
10
  }
11
 
12
  foreach ($ampforwp_tags as $tag) {
13
+ echo '<span>'. $tag->name .'</span>';
14
  }
15
 
16
  //if RTL is ON
templates/design-manager/design-2/style.php CHANGED
@@ -549,6 +549,9 @@ main .amp-wp-content.comments_list {
549
  margin-top: 10px;
550
  margin-bottom: -20px;
551
  }
 
 
 
552
  .amp-ad-4{
553
  margin-top:10px;
554
  }
@@ -791,12 +794,16 @@ amp-user-notification button {
791
  content: " <?php global $redux_builder_amp; echo $redux_builder_amp['amp-translator-by-text']; ?> ";
792
  }
793
 
794
- .ampforwp-tax-category a:after,
795
- .ampforwp-tax-tag a:after {
 
 
 
 
796
  content: ', ';
797
  }
798
- .ampforwp-tax-category a:last-child:after,
799
- .ampforwp-tax-tag a:last-child:after {
800
  content: ' ';
801
  }
802
 
549
  margin-top: 10px;
550
  margin-bottom: -20px;
551
  }
552
+ html .single-post .ampforwp-incontent-ad-1 {
553
+ margin-bottom: 10px;
554
+ }
555
  .amp-ad-4{
556
  margin-top:10px;
557
  }
794
  content: " <?php global $redux_builder_amp; echo $redux_builder_amp['amp-translator-by-text']; ?> ";
795
  }
796
 
797
+ .ampforwp-tax-category span:first-child:after {
798
+ content: ' ';
799
+ }
800
+
801
+ .ampforwp-tax-category span:after,
802
+ .ampforwp-tax-tag span:after {
803
  content: ', ';
804
  }
805
+ .ampforwp-tax-category span:last-child:after,
806
+ .ampforwp-tax-tag span:last-child:after {
807
  content: ' ';
808
  }
809
 
templates/features.php CHANGED
@@ -52,7 +52,7 @@
52
  }
53
 
54
  function ampforwp_add_endpoint_actions() {
55
- if ( is_home() || is_archive()) {
56
 
57
  $is_amp_endpoint = is_amp_endpoint();
58
 
@@ -73,9 +73,7 @@
73
  $amp_url = home_url('/?amp');
74
  }
75
  elseif ( is_archive() ) {
76
- global $wp;
77
- $archive_current_url = add_query_arg( '', '', home_url( $wp->request ) );
78
- $amp_url = $archive_current_url . '/?amp';
79
  } else {
80
  $amp_url = trailingslashit( get_permalink().'amp' );
81
  }
52
  }
53
 
54
  function ampforwp_add_endpoint_actions() {
55
+ if ( is_home() || is_archive() ) {
56
 
57
  $is_amp_endpoint = is_amp_endpoint();
58
 
73
  $amp_url = home_url('/?amp');
74
  }
75
  elseif ( is_archive() ) {
76
+ return;
 
 
77
  } else {
78
  $amp_url = trailingslashit( get_permalink().'amp' );
79
  }