fix for admin page

Author: aristath

activate.php

@@ -12,9 +12,10 @@
  * @since 1.0.0
  */
 function sqlite_plugin_activation_redirect() {
-	wp_safe_redirect( admin_url( 'admin.php?page=sqlite-integration' ) );
+	wp_redirect( admin_url( 'options-general.php?page=sqlite-integration' ) );
+	exit;
 }
-register_activation_hook( __FILE__, 'sqlite_plugin_activation_redirect' );
+// register_activation_hook( SQLITE_MAIN_FILE, 'sqlite_plugin_activation_redirect' );
 
 /**
  * Check the URL to ensure we're on the plugin page,
@@ -27,7 +28,7 @@ function sqlite_plugin_activation_redirect() {
  */
 function sqlite_activation() {
 	global $current_screen;
-	if ( isset( $current_screen->base ) && 'toplevel_page_sqlite-integration' === $current_screen->base ) {
+	if ( isset( $current_screen->base ) && 'settings_page_sqlite-integration' === $current_screen->base ) {
 		return;
 	}
 	if ( isset( $_GET['confirm-install'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'sqlite-install' ) ) {

admin-notices.php

@@ -15,7 +15,7 @@ function sqlite_plugin_admin_notice() {
 
 	// Don't print notices in the plugin's admin screen.
 	global $current_screen;
-	if ( isset( $current_screen->base ) && 'toplevel_page_sqlite-integration' === $current_screen->base ) {
+	if ( isset( $current_screen->base ) && 'settings_page_sqlite-integration' === $current_screen->base ) {
 		return;
 	}
 

admin-page.php

@@ -13,29 +13,17 @@
  * @since 1.0.0
  */
 function sqlite_add_dummy_admin_menu() {
-	add_menu_page(
+	add_options_page(
 		__( 'SQLite integration', 'sqlite' ),
 		__( 'SQLite integration', 'sqlite' ),
 		'manage_options',
 		'sqlite-integration',
 		'sqlite_integration_pre_install_check_screen',
-		'',
-		3
 	);
 
 }
 add_action( 'admin_menu', 'sqlite_add_dummy_admin_menu' );
 
-/**
- * Remove the admin menu, leaving the page itself.
- *
- * @since 1.0.0
- */
-function sqlite_remove_dummy_admin_menu() {
-	remove_menu_page( 'sqlite-integration' );
-}
-add_action( 'admin_init', 'sqlite_remove_dummy_admin_menu' );
-
 /**
  * The admin page contents.
  */

sqlite.php

@@ -13,8 +13,8 @@
 
 define( 'SQLITE_MAIN_FILE', __FILE__ );
 
+require_once __DIR__ . '/admin-page.php';
 require_once __DIR__ . '/activate.php';
 require_once __DIR__ . '/deactivate.php';
-require_once __DIR__ . '/admin-page.php';
 require_once __DIR__ . '/admin-notices.php';
 require_once __DIR__ . '/health-check.php';