Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.9.33 #401

Merged
merged 13 commits into from Jan 17, 2017
Merged

0.9.33 #401

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3ed8a02
Update single.php
Lofesa Jan 11, 2017
aa9a90c
Update single.php
Lofesa Jan 11, 2017
faf395b
Update features.php
Lofesa Jan 11, 2017
c127bf5
Update features.php
Lofesa Jan 11, 2017
e73149f
add preconnect
Lofesa Jan 11, 2017
07c3ff1
add preconnect
Lofesa Jan 11, 2017
327751c
add preconnect
Lofesa Jan 11, 2017
74e04d3
add preconnect
Lofesa Jan 11, 2017
3cdcd5e
mistake with preconnect
Lofesa Jan 11, 2017
94287c5
Update features.php
Lofesa Jan 15, 2017
40bca22
Code "$content = do_shortcode($content);" removed as requested
Lofesa Jan 16, 2017
521052a
Update single.php
Lofesa Jan 16, 2017
6abf41b
Update single.php
Lofesa Jan 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/design-manager/design-1/index.php
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<html amp <?php echo AMP_HTML_Utils::build_attributes_string( $this->get( 'html_tag_attributes' ) ); ?>>
<head>
<meta charset="utf-8">
<link rel="dns-prefetch" href="https://cdn.ampproject.org">
<link rel="preconnect" href="https://cdn.ampproject.org">
<?php
global $redux_builder_amp;
if ( is_home() || is_front_page() ){
Expand Down
6 changes: 4 additions & 2 deletions templates/design-manager/design-1/single.php
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<html amp <?php echo AMP_HTML_Utils::build_attributes_string( $this->get( 'html_tag_attributes' ) ); ?>>
<head>
<meta charset="utf-8">
<link rel="dns-prefetch" href="https://cdn.ampproject.org">
<link rel="preconnect" href="https://cdn.ampproject.org">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
<?php do_action( 'amp_post_template_head', $this ); ?>
<style amp-custom>
Expand Down Expand Up @@ -30,6 +30,7 @@
if( $options ) {
$values = array_values($options );
global $post;
if( comments_open() ) {
$comments_count = wp_count_comments($post->ID);
if( in_array('comments:0',$values) ) {
button_code();
Expand All @@ -39,6 +40,7 @@
if($count === 0 && $comments_count->approved == 0) {
button_code();
}
}
?>
<?php do_action('ampforwp_post_after_design_elements') ?>
</article>
Expand All @@ -55,4 +57,4 @@ function button_code() { global $redux_builder_amp ;?>
<div class="comment-button-wrapper">
<a href="<?php echo get_permalink().'#commentform' ?>"><?php esc_html_e( $redux_builder_amp['amp-translator-leave-a-comment-text'] ); ?></a>
</div>
<?php }
<?php }
2 changes: 1 addition & 1 deletion templates/design-manager/design-2/index.php
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<html amp>
<head>
<meta charset="utf-8">
<link rel="dns-prefetch" href="https://cdn.ampproject.org">
<link rel="preconnect" href="https://cdn.ampproject.org">
<?php
global $redux_builder_amp;
if ( is_home() || is_front_page() ){
Expand Down
6 changes: 4 additions & 2 deletions templates/design-manager/design-2/single.php
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<html amp>
<head>
<meta charset="utf-8">
<link rel="dns-prefetch" href="https://cdn.ampproject.org">
<link rel="preconnect" href="https://cdn.ampproject.org">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
<?php do_action( 'amp_post_template_head', $this ); ?>
<style amp-custom>
Expand All @@ -30,6 +30,7 @@
if( $options ) {
$values = array_values($options );
global $post;
if( comments_open() ) {
$comments_count = wp_count_comments($post->ID);
if( in_array('comments:0',$values) ) {
button_code();
Expand All @@ -38,6 +39,7 @@
}
if($count === 0 && $comments_count->approved == 0) {
button_code();
}
}
?>
<?php do_action('ampforwp_post_after_design_elements') ?>
Expand All @@ -53,4 +55,4 @@ function button_code() { global $redux_builder_amp ;?>
<div class="comment-button-wrapper">
<a href="<?php echo get_permalink().'#commentform' ?>"><?php esc_html_e( $redux_builder_amp['amp-translator-leave-a-comment-text'] ); ?></a>
</div>
<?php }
<?php }
5 changes: 5 additions & 0 deletions templates/features.php
View file
Open in desktop
Expand Up @@ -460,6 +460,7 @@ function ampforwp_strip_invalid_content() {
add_filter( 'the_content', 'ampforwp_the_content_filter', 2 );
}
function ampforwp_the_content_filter( $content ) {
$content = do_shortcode($content);
$content = preg_replace('/property=[^>]*/', '', $content);
$content = preg_replace('/vocab=[^>]*/', '', $content);
$content = preg_replace('/type=[^>]*/', '', $content);
Expand Down Expand Up @@ -616,6 +617,10 @@ function ampforwp_update_metadata_featured_image( $metadata, $post ) {
);
$metadata['headline'] = $structured_data_archive_title;
}
if ($metadata['image']['width'] < 696) {
$metadata['image']['width'] = 700;
}

return $metadata;
}

Expand Down