Changeset 2788848

Timestamp:

09/22/2022 05:59:18 PM (23 months ago)

Author:

kbrownkd

Message:

Fix a bug that broke some admin page links when Jetpack plugins are active.

Location:

akismet/trunk

Files:

• akismet.php (modified) (2 diffs)
• class.akismet-admin.php (modified) (4 diffs)
• readme.txt (modified) (1 diff)

akismet/trunk/akismet.php

@@ -7 +7 @@
 Plugin URI: https://akismet.com/
 Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam</strong>. It keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key.
-Version: 5.0.1a1
+Version: 5.0.1a
 Author: Automattic
 Author URI: https://automattic.com/wordpress-plugins/
@@ -38 +38 @@
 }
 
-define( 'AKISMET_VERSION', '5.0.1a1' );
+define( 'AKISMET_VERSION', '5.0.1a' );
 define( 'AKISMET__MINIMUM_WP_VERSION', '5.0' );
 define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

akismet/trunk/class.akismet-admin.php

@@ -75 +75 @@
             delete_option( 'Activated_Akismet' );
             if ( ! headers_sent() ) {
-                wp_redirect( add_query_arg( array( 'page' => 'akismet-key-config', 'view' => 'start' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) ) );
+                $admin_url = self::get_page_url( 'init' );
+                wp_redirect( $admin_url );
             }
         }
@@ -91 +92 @@
 
     public static function admin_menu() {
-        if ( class_exists( 'Jetpack' ) )
+        if ( class_exists( 'Jetpack' ) )
             add_action( 'jetpack_admin_menu', array( 'Akismet_Admin', 'load_menu' ) );
-        else
+        
             self::load_menu();
+
     }
 
@@ -405 +407 @@
 
             if ( ! Akismet::get_api_key() ) {
-                $link = add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) );
+                $link = );
                 $classes[] = 'ajax-disabled';
             }
@@ -826 +828 @@
         $args = array( 'page' => 'akismet-key-config' );
 
-        if ( $page == 'stats' )
+        if ( $page == 'stats' )
             $args = array( 'page' => 'akismet-key-config', 'view' => 'stats' );
-        elseif ( $page == 'delete_key' )
+        
             $args = array( 'page' => 'akismet-key-config', 'view' => 'start', 'action' => 'delete-key', '_wpnonce' => wp_create_nonce( self::NONCE ) );
-
-        $url = add_query_arg( $args, class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) );
-
-        return $url;
+        } elseif ( $page === 'init' ) {
+            $args = array( 'page' => 'akismet-key-config', 'view' => 'start' );
+        }
+
+        return add_query_arg( $args, menu_page_url( 'akismet-key-config', false ) );
     }
     

akismet/trunk/readme.txt

@@ -35 +35 @@
 *Release Date - TBD*
 
-* Add an empty state for the Statistics section on the admin page.
+* Added an empty state for the Statistics section on the admin page.
+* Fixed a bug that broke some admin page links when Jetpack plugins are active.
 
 = 5.0 =