Module info: refactor Module info, remove unused filter.

There was a time when disconnected users could find out more about a specific module before to connect Jetpack to WordPress.com. Now that the UI has changed, the modules don't display any modal until you're connected. The jetpack_module_more_info_connected_<module-slug> hooks are consequently not userful anymore.
Automattic · Jan 4, 2016 · 644fa6a · 644fa6a
1 parent 6474a65
commit 644fa6a
Show file tree

Hide file tree

Showing 4 changed files with 267 additions and 409 deletions.
diff --git a/class.jetpack-admin.php b/class.jetpack-admin.php
@@ -111,23 +111,13 @@ function get_modules() {
 				$module_array['learn_more_button'] = ob_get_clean();
 
 				ob_start();
-				if ( Jetpack::is_active() && has_action( 'jetpack_module_more_info_connected_' . $module ) ) {
-					/**
-					 * Allow the display of information text when Jetpack is connected to WordPress.com.
-					 * The dynamic part of the action, $module, is the module slug.
-					 *
-					 * @since 3.0.0
-					 */
-					do_action( 'jetpack_module_more_info_connected_' . $module );
-				} else {
-					/**
-					 * Allow the display of information text when Jetpack is connected to WordPress.com.
-					 * The dynamic part of the action, $module, is the module slug.
-					 *
-					 * @since 3.0.0
-					 */
-					do_action( 'jetpack_module_more_info_' . $module );
-				}
+				/**
+				 * Allow the display of information text when Jetpack is connected to WordPress.com.
+				 * The dynamic part of the action, $module, is the module slug.
+				 *
+				 * @since 3.0.0
+				 */
+				do_action( 'jetpack_module_more_info_' . $module );
 
 				/**
 				* Filter the long description of a module.

diff --git a/class.jetpack-modules-list-table.php b/class.jetpack-modules-list-table.php
@@ -306,13 +306,8 @@ function column_description( $item ) {
 		/** This action is documented in class.jetpack-admin.php */
 		do_action( 'jetpack_learn_more_button_' . $item['module'] );
 		echo '<div id="more-info-' . $item['module'] . '" class="more-info">';
-		if ( Jetpack::is_active() && has_action( 'jetpack_module_more_info_connected_' . $item['module'] ) ) {
-			/** This action is documented in class.jetpack-admin.php */
-			do_action( 'jetpack_module_more_info_connected_' . $item['module'] );
-		} else {
-			/** This action is documented in class.jetpack-admin.php */
-			do_action( 'jetpack_module_more_info_' . $item['module'] );
-		}
+		/** This action is documented in class.jetpack-admin.php */
+		do_action( 'jetpack_module_more_info_' . $item['module'] );
 		echo '</div>';
 		return ob_get_clean();
 	}

diff --git a/json-endpoints/jetpack/class.jetpack-json-api-modules-endpoint.php b/json-endpoints/jetpack/class.jetpack-json-api-modules-endpoint.php
@@ -93,13 +93,8 @@ protected static function format_module( $module_slug ) {
 
 		// Fetch the HTML formatted long description
 		ob_start();
-		if ( Jetpack::is_active() && has_action( 'jetpack_module_more_info_connected_' . $module_slug ) ) {
-			/** This action is documented in class.jetpack-modules-list-table.php */
-			do_action( 'jetpack_module_more_info_connected_' . $module_slug );
-		} else {
-			/** This action is documented in class.jetpack-modules-list-table.php */
-			do_action( 'jetpack_module_more_info_' . $module_slug );
-		}
+		/** This action is documented in class.jetpack-modules-list-table.php */
+		do_action( 'jetpack_module_more_info_' . $module_slug );
 		$module['description']  = ob_get_clean();
 
 		return $module;