Remove Photon activation block introduced in r622206 since the public options isn't refreshed after Jetpack is activated.

ethitter · ethitter · commit 6c627db3d1c5 · 2012-11-07T17:46:41.000Z
diff --git a/modules/module-extras.php b/modules/module-extras.php
@@ -38,16 +38,4 @@ function jetpack_load_infinite_scroll_annotation() {
 function jetpack_can_activate_infinite_scroll( $can_activate ) {
 	return (bool) current_theme_supports( 'infinite-scroll' );
 }
-add_filter( 'jetpack_can_activate_infinite-scroll', 'jetpack_can_activate_infinite_scroll' );
-
-/**
- * Prevent Photon from being activated if the site isn't public.
- *
- * @param bool $can_activate
- * @filter jetpack_can_activate_photon
- * @return bool
- */
-function jetpack_can_activate_photon( $can_activate ) {
-	return Jetpack::get_option( 'public' );
-}
-add_filter( 'jetpack_can_activate_photon', 'jetpack_can_activate_photon' );
+add_filter( 'jetpack_can_activate_infinite-scroll', 'jetpack_can_activate_infinite_scroll' );
diff --git a/modules/module-info.php b/modules/module-info.php
@@ -708,10 +708,6 @@ function jetpack_photon_more_info() { ?>
 	<h4><?php esc_html_e( 'Photon' , 'jetpack' ); ?></h4>
 
 	<p><?php esc_html_e( "Give your site a boost by loading images in post and posts' featured images from the WordPress.com content delivery network. We cache your images and serve them from our super-fast network, reducing the burden on your web host with the click of a button.", 'jetpack' ); ?></p>
-
-	<?php if ( ! Jetpack::get_option( 'public' ) ) : ?>
-	<p><strong><?php esc_html_e( "At this time, Photon cannot be activated on this site because it isn't publicly accessible.", 'jetpack' ); ?></strong></p>
-	<?php endif; ?>
 <?php
 }
 add_action( 'jetpack_module_more_info_photon', 'jetpack_photon_more_info' );
