From 1f7ed24a36f109cde5d3b9a934f64d1e877ba4a2 Mon Sep 17 00:00:00 2001 From: Justin Tadlock Date: Mon, 26 Aug 2013 13:37:19 -0500 Subject: [PATCH 1/4] Version bump to 1.6.1-beta. --- hybrid.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hybrid.php b/hybrid.php index 3a6d75a0..2fbcf42c 100644 --- a/hybrid.php +++ b/hybrid.php @@ -24,7 +24,7 @@ * to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * @package HybridCore - * @version 1.6.0 + * @version 1.6.1-beta * @author Justin Tadlock * @copyright Copyright (c) 2008 - 2013, Justin Tadlock * @link http://themehybrid.com/hybrid-core @@ -93,7 +93,7 @@ function __construct() { function constants() { /* Sets the framework version number. */ - define( 'HYBRID_VERSION', '1.6.0' ); + define( 'HYBRID_VERSION', '1.6.1' ); /* Sets the path to the parent theme directory. */ define( 'THEME_DIR', get_template_directory() ); From 0562d35b00ebba7e47055c1a9e9953e86d01495d Mon Sep 17 00:00:00 2001 From: Justin Tadlock Date: Mon, 26 Aug 2013 13:38:26 -0500 Subject: [PATCH 2/4] Don't load file with locate_template(). This won't allow the filters to be applied. --- functions/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/template.php b/functions/template.php index 5ecd4bb4..05ad2434 100644 --- a/functions/template.php +++ b/functions/template.php @@ -54,7 +54,7 @@ function hybrid_get_content_template() { $templates[] = 'content.php'; /* Apply filters and return the found content template. */ - return apply_atomic( 'content_template', locate_template( $templates, true, false ) ); + include( apply_atomic( 'content_template', locate_template( $templates, false, false ) ) ); } ?> \ No newline at end of file From 307a8c300dacad22650c2b193236d91513c1dc67 Mon Sep 17 00:00:00 2001 From: Justin Tadlock Date: Wed, 28 Aug 2013 00:10:54 -0500 Subject: [PATCH 3/4] Set 'max-width' rather than 'width' so that captions work better with responsive design. --- extensions/cleaner-caption.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/cleaner-caption.php b/extensions/cleaner-caption.php index b8a80f07..a9a8b228 100644 --- a/extensions/cleaner-caption.php +++ b/extensions/cleaner-caption.php @@ -16,7 +16,7 @@ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @package CleanerCaption - * @version 0.2.0 + * @version 0.2.1 * @author Justin Tadlock * @copyright Copyright (c) 2013, Justin Tadlock * @link http://justintadlock.com @@ -67,7 +67,7 @@ function cleaner_caption( $output, $attr, $content ) { /* Set up the attributes for the caption
. */ $attributes = ( !empty( $attr['id'] ) ? ' id="' . esc_attr( $attr['id'] ) . '"' : '' ); $attributes .= ' class="wp-caption ' . esc_attr( $attr['align'] ) . '"'; - $attributes .= ' style="width: ' . esc_attr( $attr['width'] ) . 'px"'; + $attributes .= ' style="max-width: ' . esc_attr( $attr['width'] ) . 'px"'; /* Open the caption
. */ $output = ''; From 65ee0d4e94bb2decfbe11047bc3f2709a2845101 Mon Sep 17 00:00:00 2001 From: Justin Tadlock Date: Tue, 3 Sep 2013 21:57:11 -0500 Subject: [PATCH 4/4] Version bump to 1.6.1. --- hybrid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hybrid.php b/hybrid.php index 2fbcf42c..65ff6ced 100644 --- a/hybrid.php +++ b/hybrid.php @@ -24,7 +24,7 @@ * to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * @package HybridCore - * @version 1.6.1-beta + * @version 1.6.1 * @author Justin Tadlock * @copyright Copyright (c) 2008 - 2013, Justin Tadlock * @link http://themehybrid.com/hybrid-core