← All changes | class.jetpack-network.php +7 -1 16.2-beta → 16.3-a.7 View file →

		@@ -280,9 +280,15 @@
280	280	*
281	281	* @since 2.9
282	282	*/
283	283	public function add_network_admin_menu() {
284		- $icon = ( new Logo() )->get_base64_logo();
	284	+ $logo = new Logo();
	285	+ // Another plugin may load an older Logo class before all Jetpack autoloaders register.
	286	+ if ( method_exists( $logo, 'get_base64_admin_menu_logo' ) ) {
	287	+ $icon = $logo->get_base64_admin_menu_logo();
	288	+ } else {
	289	+ $icon = $logo->get_base64_logo();
	290	+ }
285	291	add_menu_page( 'Jetpack', 'Jetpack', 'jetpack_network_admin_page', 'jetpack', array( $this, 'wrap_network_admin_page' ), $icon, 3 );
286	292	$jetpack_sites_page_hook = add_submenu_page( 'jetpack', __( 'Jetpack Sites', 'jetpack' ), __( 'Sites', 'jetpack' ), 'jetpack_network_sites_page', 'jetpack', array( $this, 'wrap_network_admin_page' ) );
287	293	$jetpack_settings_page_hook = add_submenu_page( 'jetpack', __( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_network_settings_page', 'jetpack-settings', array( $this, 'wrap_render_network_admin_settings_page' ) );
288	294	add_action( "load-$jetpack_sites_page_hook", array( $this, 'admin_init_network_page' ) );