| @@ -48,10 +48,8 @@ | ||
| 48 | 48 | // Strip last number from version as they won't be breaking changes. |
| 49 | 49 | $wp_version = preg_replace( '/\.\d+$/', '', $wp_version ); |
| 50 | 50 | |
| 51 | 51 | $is_pro_installed = \ContentControl\is_plugin_installed( 'content-control-pro/content-control-pro.php' ); |
| 52 | - $is_pro_active = $is_pro_installed && is_plugin_active( 'content-control-pro/content-control-pro.php' ); | |
| 53 | - $legacy_pro = $this->container->is_legacy_pro_active(); | |
| 54 | 52 | |
| 55 | 53 | $packages = [ |
| 56 | 54 | 'block-editor' => [ |
| 57 | 55 | 'handle' => 'content-control-block-editor', |
| @@ -87,10 +85,9 @@ | ||
| 87 | 85 | 'wp-api', |
| 88 | 86 | ], |
| 89 | 87 | 'varsName' => 'contentControlCoreData', |
| 90 | 88 | 'vars' => [ |
| 91 | - 'currentSettings' => get_all_plugin_options(), | |
| 92 | - 'legacyProLicense' => $legacy_pro, | |
| 89 | + 'currentSettings' => get_all_plugin_options(), | |
| 93 | 90 | ], |
| 94 | 91 | ], |
| 95 | 92 | 'data' => [ |
| 96 | 93 | 'handle' => 'content-control-data', |
| @@ -114,20 +111,19 @@ | ||
| 114 | 111 | 'settings-page' => [ |
| 115 | 112 | 'handle' => 'content-control-settings-page', |
| 116 | 113 | 'varsName' => 'contentControlSettingsPage', |
| 117 | 114 | 'vars' => [ |
| 118 | - 'pluginUrl' => $this->container->get( 'url' ), | |
| 119 | - 'wpVersion' => $wp_version, | |
| 120 | - 'adminUrl' => admin_url(), | |
| 121 | - 'restBase' => 'content-control/v2', | |
| 122 | - 'userRoles' => allowed_user_roles(), | |
| 123 | - 'logUrl' => current_user_can( 'manage_options' ) ? $this->container->get( 'logging' )->get_file_url() : false, | |
| 124 | - 'rolesAndCaps' => wp_roles()->roles, | |
| 125 | - 'version' => $this->container->get( 'version' ), | |
| 126 | - 'permissions' => $permissions, | |
| 127 | - 'isProInstalled' => $is_pro_installed, | |
| 128 | - 'isProActivated' => $is_pro_active, | |
| 129 | - 'legacyProLicense' => $legacy_pro, | |
| 115 | + 'pluginUrl' => $this->container->get( 'url' ), | |
| 116 | + 'wpVersion' => $wp_version, | |
| 117 | + 'adminUrl' => admin_url(), | |
| 118 | + 'restBase' => 'content-control/v2', | |
| 119 | + 'userRoles' => allowed_user_roles(), | |
| 120 | + 'logUrl' => current_user_can( 'manage_options' ) ? $this->container->get( 'logging' )->get_file_url() : false, | |
| 121 | + 'rolesAndCaps' => wp_roles()->roles, | |
| 122 | + 'version' => $this->container->get( 'version' ), | |
| 123 | + 'permissions' => $permissions, | |
| 124 | + 'isProInstalled' => $is_pro_installed, | |
| 125 | + 'isProActivated' => $is_pro_installed && is_plugin_active( 'content-control-pro/content-control-pro.php' ), | |
| 130 | 126 | ], |
| 131 | 127 | 'styles' => true, |
| 132 | 128 | ], |
| 133 | 129 | 'utils' => [ |