1 files changed, 10 insertions, 16 deletions

diff --git a/plugins/jetpack/modules/infinite-scroll/themes/twentyeleven.php b/plugins/jetpack/modules/infinite-scroll/themes/twentyeleven.php
index d7f21e38..42a69b2d 100644
--- a/plugins/jetpack/modules/infinite-scroll/themes/twentyeleven.php
+++ b/plugins/jetpack/modules/infinite-scroll/themes/twentyeleven.php
@@ -8,35 +8,30 @@
 /**
  * Add theme support for infinity scroll
  */
-function twenty_eleven_infinite_scroll_init() {
+function jetpack_twentyeleven_infinite_scroll_init() {
 	add_theme_support( 'infinite-scroll', array(
-		'container' => 'content',
-		'footer'    => 'page',
+		'container'      => 'content',
+		'footer'         => 'page',
+		'footer_widgets' => jetpack_twentyeleven_has_footer_widgets(),
 	) );
 }
-add_action( 'init', 'twenty_eleven_infinite_scroll_init' );
+add_action( 'init', 'jetpack_twentyeleven_infinite_scroll_init' );
 
 /**
  * Enqueue CSS stylesheet with theme styles for infinity.
  */
-function twenty_eleven_infinite_scroll_enqueue_styles() {
+function jetpack_twentyeleven_infinite_scroll_enqueue_styles() {
 	if ( wp_script_is( 'the-neverending-homepage' ) ) {
 		// Add theme specific styles.
 		wp_enqueue_style( 'infinity-twentyeleven', plugins_url( 'twentyeleven.css', __FILE__ ), array( 'the-neverending-homepage' ), '20121002' );
 	}
 }
-add_action( 'wp_enqueue_scripts', 'twenty_eleven_infinite_scroll_enqueue_styles', 25 );
+add_action( 'wp_enqueue_scripts', 'jetpack_twentyeleven_infinite_scroll_enqueue_styles', 25 );
 
 /**
- * Have we any footer widgets?
- *
- * @param bool $has_widgets
- * @uses is_active_sidebar
- * @uses jetpack_is_mobile
- * @filter infinite_scroll_has_footer_widgets
- * @return bool
+ * Do we have footer widgets?
  */
-function twenty_eleven_has_footer_widgets( $has_widgets ) {
+function jetpack_twentyeleven_has_footer_widgets() {
 	// Are any of the "Footer Area" sidebars active?
 	if ( is_active_sidebar( 'sidebar-3' ) || is_active_sidebar( 'sidebar-4' ) || is_active_sidebar( 'sidebar-5' ) )
 		return true;
@@ -45,6 +40,5 @@ function twenty_eleven_has_footer_widgets( $has_widgets ) {
 	if ( function_exists( 'jetpack_is_mobile' ) && jetpack_is_mobile() && is_active_sidebar( 'sidebar-1' ) )
 		return true;
 
-	return $has_widgets;
+	return false;
 }
-add_filter( 'infinite_scroll_has_footer_widgets', 'twenty_eleven_has_footer_widgets' );