framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #274 - avoid duplicate canonical with WordPress SEO plugin

Browse Source
This commit is contained in:
Ben Word
2012-02-13 08:37:37 -07:00
parent 551fc9ca50
commit be3e67f862
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
inc/roots-cleanup.php
View File

@@ -174,11 +174,14 @@ function roots_head_cleanup() {
remove_action('wp_head', 'wp_shortlink_wp_head', 10, 0); remove_action('wp_head', 'wp_shortlink_wp_head', 10, 0);
remove_action('wp_head', 'noindex', 1); remove_action('wp_head', 'noindex', 1);
add_action('wp_head', 'roots_noindex'); add_action('wp_head', 'roots_noindex');
remove_action('wp_head', 'rel_canonical');
add_action('wp_head', 'roots_rel_canonical');
add_action('wp_head', 'roots_remove_recent_comments_style', 1); add_action('wp_head', 'roots_remove_recent_comments_style', 1);
add_filter('gallery_style', 'roots_gallery_style'); add_filter('gallery_style', 'roots_gallery_style');
if (!class_exists('WPSEO_Frontend')) {
remove_action('wp_head', 'rel_canonical');
add_action('wp_head', 'roots_rel_canonical');
}
// deregister l10n.js (new since WordPress 3.1) // deregister l10n.js (new since WordPress 3.1)
// why you might want to keep it: http://wordpress.stackexchange.com/questions/5451/what-does-l10n-js-do-in-wordpress-3-1-and-how-do-i-remove-it/5484#5484 // why you might want to keep it: http://wordpress.stackexchange.com/questions/5451/what-does-l10n-js-do-in-wordpress-3-1-and-how-do-i-remove-it/5484#5484
// don't load jQuery through WordPress since it's linked in header.php // don't load jQuery through WordPress since it's linked in header.php