Updated installation paths

Author: dcooney

ajax-load-more-for-users.php

@@ -32,21 +32,15 @@
  *  Installation hook.
  */
 function alm_users_extension_install() {
-	// Users add-on is installed.
+	// Users "add-on" is installed, deactivate it.
 	if ( is_plugin_active( 'ajax-load-more-users/ajax-load-more-users.php' ) ) {
-		// Deactivate the add-on.
 		deactivate_plugins( 'ajax-load-more-users/ajax-load-more-users.php' );
 	}
 
 	// ALM Pro add-on is installed and Users is activated.
 	if ( is_plugin_active( 'ajax-load-more-pro/ajax-load-more-pro.php' ) && class_exists( 'ALMUsers' ) ) {
 		set_transient( 'alm_users_extension_pro_admin_notice', true, 5 );
 	}
-
-	// Confirm core Ajax Load More is installed.
-	if ( ! is_plugin_active( 'ajax-load-more/ajax-load-more.php' ) ) {
-		set_transient( 'alm_users_extension_admin_notice', true, 5 );
-	}
 }
 register_activation_hook( __FILE__, 'alm_users_extension_install' );
 

functions/install.php

@@ -9,37 +9,15 @@
  * Display admin notice Users add-on is installed.
  */
 function alm_users_extension_pro_admin_notice() {
-	$slug   = 'ajax-load-more';
-	$plugin = $slug . '-for-users';
 	// Ajax Load More Notice.
 	if ( get_transient( 'alm_users_extension_pro_admin_notice' ) ) {
-		$install_url = get_admin_url() . '/update.php?action=install-plugin&plugin=' . $slug . '&_wpnonce=' . wp_create_nonce( 'install-plugin_' . $slug );
-		$message     = '<div class="error">';
-		$message    .= '<p>You must deactivate the Users add-on in Ajax Load More Pro or update the Pro add-on before installing the Users extension.</p>';
-		$message    .= '<p><a href="./plugins.php">Back to Plugins</a></p>';
-		$message    .= '</div>';
+		$message  = '<div class="error">';
+		$message .= '<p>You must deactivate the Users add-on in Ajax Load More Pro or update the Pro add-on before installing the Users extension.</p>';
+		$message .= '<p><a href="./plugins.php">Back to Plugins</a></p>';
+		$message .= '</div>';
 		echo wp_kses_post( $message );
 		delete_transient( 'alm_users_extension_pro_admin_notice' );
 		wp_die();
 	}
 }
 add_action( 'admin_notices', 'alm_users_extension_pro_admin_notice' );
-
-/**
- * Display admin notice if plugin does not meet the requirements.
- */
-function alm_users_extension_admin_notice() {
-	$slug   = 'ajax-load-more';
-	$plugin = $slug . '-for-users';
-	// Ajax Load More Notice.
-	if ( get_transient( 'alm_users_extension_admin_notice' ) ) {
-		$install_url = get_admin_url() . '/update.php?action=install-plugin&plugin=' . $slug . '&_wpnonce=' . wp_create_nonce( 'install-plugin_' . $slug );
-		$message     = '<div class="error">';
-		$message    .= '<p>You must install and activate the core Ajax Load More plugin before using the Ajax Load More Users extension.</p>';
-		$message    .= '<p>' . sprintf( '<a href="%s" class="button-primary">%s</a>', $install_url, 'Install Ajax Load More Now' ) . '</p>';
-		$message    .= '</div>';
-		echo wp_kses_post( $message );
-		delete_transient( 'alm_users_extension_admin_notice' );
-	}
-}
-add_action( 'admin_notices', 'alm_users_extension_admin_notice' );