Merge branch '1.6'

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 <justin@justintadlock.com>
  * @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 <div>. */
 	$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 <div>. */
 	$output = '<figure' . $attributes .'>';

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 ) ) );
 }
 
 ?>

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
  * @author    Justin Tadlock <justin@justintadlock.com>
  * @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() );