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

Stats: Update method for inserting JavaScript - Removed fallback / workaround for themes without wp_footer #13182

Merged
merged 2 commits into from
Aug 16, 2019
Merged

Stats: Update method for inserting JavaScript - Removed fallback / workaround for themes without wp_footer #13182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2cd2ae
Removed fallback / workaround for themes without wp_footer
rickcurran Aug 5, 2019
ca0f3f7
Fixed incorrect use of spaces instead of tabs
rickcurran Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions modules/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ function stats_map_meta_caps( $caps, $cap, $user_id ) {
* @return void
*/
function stats_template_redirect() {
global $current_user, $rendered_stats_footer;
global $current_user;

if ( is_feed() || is_robots() || is_trackback() || is_preview() || jetpack_is_dnt_enabled() ) {
return;
Expand All @@ -184,9 +184,7 @@ function stats_template_redirect() {
}

add_action( 'wp_footer', 'stats_footer', 101 );
add_action( 'wp_head', 'stats_add_shutdown_action' );

$rendered_stats_footer = false;
}


Expand Down Expand Up @@ -225,16 +223,6 @@ function stats_build_view_data() {
return compact( 'v', 'j', 'blog', 'post', 'tz', 'srv' );
}

/**
* Stats Add Shutdown Action.
*
* @access public
* @return void
*/
function stats_add_shutdown_action() {
// Just in case wp_footer isn't in your theme.
add_action( 'shutdown', 'stats_footer', 101 );
}

/**
* Stats Footer.
Expand All @@ -243,17 +231,13 @@ function stats_add_shutdown_action() {
* @return void
*/
function stats_footer() {
global $rendered_stats_footer;

if ( ! $rendered_stats_footer ) {
$data = stats_build_view_data();
if ( Jetpack_AMP_Support::is_amp_request() ) {
stats_render_amp_footer( $data );
} else {
stats_render_footer( $data );
}
$rendered_stats_footer = true;
$data = stats_build_view_data();
if ( Jetpack_AMP_Support::is_amp_request() ) {
stats_render_amp_footer( $data );
} else {
stats_render_footer( $data );
}

}

function stats_render_footer( $data ) {
Expand Down