From 9f32ae22c2a3b65c995565e42591710e4949348c Mon Sep 17 00:00:00 2001 From: Justin Tadlock Date: Mon, 5 Aug 2013 19:42:18 -0500 Subject: [PATCH] Fix issues with hybrid.php caused by the merge. --- hybrid.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hybrid.php b/hybrid.php index 31c284e9..3a6d75a0 100644 --- a/hybrid.php +++ b/hybrid.php @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License along with this program; if not, write * to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * @package HybridCore + * @package HybridCore * @version 1.6.0 * @author Justin Tadlock * @copyright Copyright (c) 2008 - 2013, Justin Tadlock @@ -92,9 +92,9 @@ function __construct() { */ function constants() { - /* Sets the framework version number. */ + /* Sets the framework version number. */ define( 'HYBRID_VERSION', '1.6.0' ); - + /* Sets the path to the parent theme directory. */ define( 'THEME_DIR', get_template_directory() ); @@ -241,16 +241,16 @@ function functions() { /* Load the metadata functions. */ require_once( trailingslashit( HYBRID_FUNCTIONS ) . 'meta.php' ); + /* Load the template functions. */ require_once( trailingslashit( HYBRID_FUNCTIONS ) . 'template.php' ); - /* Load the utility functions. */ require_once( trailingslashit( HYBRID_FUNCTIONS ) . 'utility.php' ); + /* Load the wish-list functions. */ require_once( trailingslashit( HYBRID_FUNCTIONS ) . 'wish-list.php' ); - /* Load the theme settings functions if supported. */ require_if_theme_supports( 'hybrid-core-theme-settings', trailingslashit( HYBRID_FUNCTIONS ) . 'settings.php' ); @@ -280,13 +280,13 @@ function functions() { /* Load the scripts if supported. */ require_if_theme_supports( 'hybrid-core-scripts', trailingslashit( HYBRID_FUNCTIONS ) . 'scripts.php' ); + /* Load the media grabber script if supported. */ require_if_theme_supports( 'hybrid-core-media-grabber', trailingslashit( HYBRID_CLASSES ) . 'hybrid-media-grabber.php' ); /* Load the post format functionality if post formats are supported. */ require_if_theme_supports( 'post-formats', trailingslashit( HYBRID_FUNCTIONS ) . 'post-formats.php' ); - /* Load the deprecated functions if supported. */ require_if_theme_supports( 'hybrid-core-deprecated', trailingslashit( HYBRID_FUNCTIONS ) . 'deprecated.php' ); } @@ -333,12 +333,12 @@ function extensions() { /* Load the Random Custom Background extension if supported. */ require_if_theme_supports( 'random-custom-background', trailingslashit( HYBRID_EXTENSIONS ) . 'random-custom-background.php' ); + /* Load the Color Palette extension if supported. */ require_if_theme_supports( 'color-palette', trailingslashit( HYBRID_EXTENSIONS ) . 'color-palette.php' ); /* Load the Theme Fonts extension if supported. */ require_if_theme_supports( 'theme-fonts', trailingslashit( HYBRID_EXTENSIONS ) . 'theme-fonts.php' ); - require_if_theme_supports( 'post-formats', trailingslashit( HYBRID_EXTENSIONS ) . 'post-format-tools.php' ); } /** @@ -383,3 +383,4 @@ function default_filters() { } } +?> \ No newline at end of file