← All changes
|
freemius/includes/managers/class-fs-admin-menu-manager.php
+25
-14
2.0.1
→
2.2.3
View file →
| @@ -203,11 +203,12 @@ | ||
| 203 | 203 | // 'page' |
| 204 | 204 | // ) ); |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - $this->_first_time_path = $this->get_option( $menu, 'first-path', false ); | |
| 208 | - if ( ! empty( $this->_first_time_path ) && is_string( $this->_first_time_path ) ) { | |
| 209 | - $this->_first_time_path = admin_url( $this->_first_time_path, 'admin' ); | |
| 207 | + $first_path = $this->get_option( $menu, 'first-path', false ); | |
| 208 | + | |
| 209 | + if ( ! empty( $first_path ) && is_string( $first_path ) ) { | |
| 210 | + $this->_first_time_path = $first_path; | |
| 210 | 211 | } |
| 211 | 212 | } |
| 212 | 213 | } |
| 213 | 214 | |
| @@ -235,19 +236,29 @@ | ||
| 235 | 236 | return $this->_is_override_exact; |
| 236 | 237 | } |
| 237 | 238 | |
| 238 | 239 | |
| 239 | - /** | |
| 240 | - * Get the path of the page the user should be forwarded to after first activation. | |
| 241 | - * | |
| 242 | - * @author Vova Feldman (@svovaf) | |
| 243 | - * @since 1.1.3 | |
| 244 | - * | |
| 245 | - * @return string | |
| 246 | - */ | |
| 247 | - function get_first_time_path() { | |
| 248 | - return $this->_first_time_path; | |
| 249 | - } | |
| 240 | + /** | |
| 241 | + * Get the path of the page the user should be forwarded to after first activation. | |
| 242 | + * | |
| 243 | + * @author Vova Feldman (@svovaf) | |
| 244 | + * @since 1.1.3 | |
| 245 | + * | |
| 246 | + * @param bool $is_network Since 2.4.5 | |
| 247 | + * | |
| 248 | + * @return string | |
| 249 | + */ | |
| 250 | + function get_first_time_path( $is_network = false ) { | |
| 251 | + if ( empty ( $this->_first_time_path ) ) { | |
| 252 | + return $this->_first_time_path; | |
| 253 | + } | |
| 254 | + | |
| 255 | + if ( $is_network ) { | |
| 256 | + return network_admin_url( $this->_first_time_path ); | |
| 257 | + } else { | |
| 258 | + return admin_url( $this->_first_time_path ); | |
| 259 | + } | |
| 260 | + } | |
| 250 | 261 | |
| 251 | 262 | /** |
| 252 | 263 | * Check if plugin's menu item is part of a custom top level menu. |
| 253 | 264 | * |