From 9801e69b3b34c42d59379a392f408b9e1da33acb Mon Sep 17 00:00:00 2001 From: Ben Word Date: Mon, 20 Aug 2012 19:17:28 -0500 Subject: [PATCH] Ref #525 - Remove all hooks --- CHANGELOG.md | 2 +- functions.php | 3 +-- inc/actions.php | 4 ++-- inc/hooks.php | 7 ------- inc/{util.php => utils.php} | 0 templates/footer.php | 3 +-- templates/head.php | 1 - 7 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 inc/hooks.php rename inc/{util.php => utils.php} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7a01ca..17795bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ * Implement scribu's [Theme Wrapper](http://scribu.net/wordpress/theme-wrappers.html) (see `base.php`) * Move templates, `comments.php`, and `searchform.php` to `templates/` folder * Rename `loop-` files to `content-` -* Remove all hooks except `roots_head` and `roots_footer` +* Remove all hooks * Use `templates/page-header.php` for page titles * Use `head.php` for everything in `` diff --git a/functions.php b/functions.php index 55d456d..b586bfc 100644 --- a/functions.php +++ b/functions.php @@ -5,14 +5,13 @@ if (!defined('__DIR__')) { define('__DIR__', dirname(__FILE__)); } -require_once locate_template('/inc/util.php'); // Utility functions +require_once locate_template('/inc/utils.php'); // Utility functions require_once locate_template('/inc/config.php'); // Configuration and constants require_once locate_template('/inc/activation.php'); // Theme activation require_once locate_template('/inc/template-tags.php'); // Template tags require_once locate_template('/inc/cleanup.php'); // Cleanup require_once locate_template('/inc/scripts.php'); // Scripts and stylesheets require_once locate_template('/inc/htaccess.php'); // Rewrites for assets, H5BP .htaccess -require_once locate_template('/inc/hooks.php'); // Hooks require_once locate_template('/inc/actions.php'); // Actions require_once locate_template('/inc/widgets.php'); // Sidebars and widgets require_once locate_template('/inc/custom.php'); // Custom functions diff --git a/inc/actions.php b/inc/actions.php index fdf88d0..d429aea 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -9,7 +9,7 @@ function roots_feed_link() { } } -add_action('roots_head', 'roots_feed_link'); +add_action('wp_head', 'roots_feed_link', -2); /** * Add the asynchronous Google Analytics snippet from HTML5 Boilerplate @@ -28,4 +28,4 @@ function roots_google_analytics() { } } -add_action('roots_footer', 'roots_google_analytics'); +add_action('wp_footer', 'roots_google_analytics'); diff --git a/inc/hooks.php b/inc/hooks.php deleted file mode 100644 index 4b94747..0000000 --- a/inc/hooks.php +++ /dev/null @@ -1,7 +0,0 @@ -©

- - \ No newline at end of file + \ No newline at end of file diff --git a/templates/head.php b/templates/head.php index 0b5327e..90bd010 100644 --- a/templates/head.php +++ b/templates/head.php @@ -14,5 +14,4 @@ - \ No newline at end of file