| @@ -23,14 +23,12 @@ | ||
| 23 | 23 | require_once GAMIPRESS_DIR . 'includes/admin/upgrades.php'; |
| 24 | 24 | |
| 25 | 25 | // Admin pages |
| 26 | 26 | require_once GAMIPRESS_DIR . 'includes/admin/pages/dashboard.php'; |
| 27 | -//require_once GAMIPRESS_DIR . 'includes/admin/pages/support.php'; | |
| 28 | 27 | require_once GAMIPRESS_DIR . 'includes/admin/pages/badge-builder.php'; |
| 29 | 28 | require_once GAMIPRESS_DIR . 'includes/admin/pages/tools.php'; |
| 30 | 29 | require_once GAMIPRESS_DIR . 'includes/admin/pages/settings.php'; |
| 31 | 30 | require_once GAMIPRESS_DIR . 'includes/admin/pages/licenses.php'; |
| 32 | -require_once GAMIPRESS_DIR . 'includes/admin/pages/assets.php'; | |
| 33 | 31 | require_once GAMIPRESS_DIR . 'includes/admin/pages/add-ons.php'; |
| 34 | 32 | /** |
| 35 | 33 | * Add custom GamiPress body classes |
| 36 | 34 | * |
| @@ -125,18 +123,22 @@ | ||
| 125 | 123 | } |
| 126 | 124 | |
| 127 | 125 | } |
| 128 | 126 | |
| 129 | - // Reorder licenses, badge builder, tools & settings | |
| 130 | - $badge_builder = $submenu['gamipress'][6]; | |
| 131 | - $licenses = $submenu['gamipress'][7]; | |
| 132 | - $tools = $submenu['gamipress'][8]; | |
| 133 | - $settings = $submenu['gamipress'][9]; | |
| 127 | + if( isset( $submenu['gamipress'][7] ) | |
| 128 | + && isset( $submenu['gamipress'][8] ) | |
| 129 | + && isset( $submenu['gamipress'][9] ) ) { | |
| 134 | 130 | |
| 135 | - $submenu['gamipress'][6] = $badge_builder; | |
| 136 | - $submenu['gamipress'][7] = $tools; | |
| 137 | - $submenu['gamipress'][8] = $settings; | |
| 138 | - $submenu['gamipress'][9] = $licenses; | |
| 131 | + // Reorder licenses, tools & settings | |
| 132 | + $licenses = $submenu['gamipress'][7]; | |
| 133 | + $tools = $submenu['gamipress'][8]; | |
| 134 | + $settings = $submenu['gamipress'][9]; | |
| 135 | + | |
| 136 | + $submenu['gamipress'][7] = $tools; | |
| 137 | + $submenu['gamipress'][8] = $settings; | |
| 138 | + $submenu['gamipress'][9] = $licenses; | |
| 139 | + | |
| 140 | + } | |
| 139 | 141 | } |
| 140 | 142 | |
| 141 | 143 | return $parent_file; |
| 142 | 144 | |
| @@ -163,11 +165,8 @@ | ||
| 163 | 165 | function gamipress_admin_addons_submenu() { |
| 164 | 166 | // Set minimum role setting for menus |
| 165 | 167 | $minimum_role = gamipress_get_manager_capability(); |
| 166 | 168 | |
| 167 | - // Assets sub menu | |
| 168 | - add_submenu_page( 'gamipress', __( 'Assets', 'gamipress' ), __( 'Assets', 'gamipress' ), $minimum_role, 'gamipress_assets', 'gamipress_assets_page' ); | |
| 169 | - | |
| 170 | 169 | // Add-ons sub menu |
| 171 | 170 | add_submenu_page( 'gamipress', __( 'Add-ons', 'gamipress' ), __( 'Add-ons', 'gamipress' ), $minimum_role, 'gamipress_add_ons', 'gamipress_add_ons_page' ); |
| 172 | 171 | } |
| 173 | 172 | add_action( 'admin_menu', 'gamipress_admin_addons_submenu', 15 ); |
| @@ -480,16 +479,8 @@ | ||
| 480 | 479 | 'parent' => 'gamipress', |
| 481 | 480 | 'href' => admin_url( 'admin.php?page=gamipress_licenses' ) |
| 482 | 481 | ) ); |
| 483 | 482 | |
| 484 | - // Assets | |
| 485 | - $wp_admin_bar->add_node( array( | |
| 486 | - 'id' => 'gamipress-assets', | |
| 487 | - 'title' => __( 'Assets', 'gamipress' ), | |
| 488 | - 'parent' => 'gamipress', | |
| 489 | - 'href' => admin_url( 'admin.php?page=gamipress_assets' ) | |
| 490 | - ) ); | |
| 491 | - | |
| 492 | 483 | // Add-ons |
| 493 | 484 | $wp_admin_bar->add_node( array( |
| 494 | 485 | 'id' => 'gamipress-add-ons', |
| 495 | 486 | 'title' => __( 'Add-ons', 'gamipress' ), |
| @@ -785,10 +776,8 @@ | ||
| 785 | 776 | $_GET['page'] === 'gamipress_settings' |
| 786 | 777 | || $_GET['page'] === 'gamipress_logs' |
| 787 | 778 | || $_GET['page'] === 'edit_gamipress_logs' |
| 788 | 779 | || $_GET['page'] === 'gamipress_add_ons' |
| 789 | - || $_GET['page'] === 'gamipress_assets' | |
| 790 | - || $_GET['page'] === 'gamipress_help_support' | |
| 791 | 780 | || $_GET['page'] === 'gamipress_badge_builder' |
| 792 | 781 | || $_GET['page'] === 'gamipress_tools' |
| 793 | 782 | || $_GET['page'] === 'gamipress' |
| 794 | 783 | ) |
