Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/tests/admin.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ test( 'Stackable settings should be saved', async ( {
// Start waiting for Stackable Settings JSON Response before visiting the page
let settings = stackable.waitForSettings()

await admin.visitAdminPage( 'options-general.php?page=stackable' )
await admin.visitAdminPage( 'admin.php?page=stackable-settings' )
// Make sure all Stackable settings are loaded
await settings

Expand Down
8 changes: 4 additions & 4 deletions freemius.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function sugb_fs() {
// Do not redirect to the getting started when in network activating
// in multisite or in the mainsite because it will redirect to a 404
// page.
$first_path = 'options-general.php?page=stackable-getting-started';
$first_path = 'admin.php?page=stackable';
if ( is_multisite() && is_main_site() ) {
$first_path = 'plugins.php';
}
Expand All @@ -34,7 +34,7 @@ function sugb_fs() {
// https://github.com/Freemius/wordpress-sdk/issues/674 If the menu
// slug is options-general, for a network activated plugin, all
// admin URLs will be broken. This is a temporary fix.
$menu_slug = 'options-general.php';
$menu_slug = 'stackable';
if ( is_multisite() && is_main_site() && is_plugin_active_for_network( plugin_basename( STACKABLE_FILE ) ) ) {
if ( ! empty( $_SERVER ) && isset( $_SERVER['REQUEST_URI'] ) && stripos( $_SERVER['REQUEST_URI'], '/admin.php' ) !== false ) {
$menu_slug = 'admin.php';
Expand All @@ -54,8 +54,8 @@ function sugb_fs() {
'menu' => array(
'slug' => 'stackable',
'first-path' => $first_path,
'account' => true,
'pricing' => true,
'account' => false,
'pricing' => false,
'contact' => true,
'support' => false,
'affiliation' => false,
Expand Down
Loading
Loading