Site Logo: 5.8 Compat

projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-site-logo-endpoint.php

@@ -73,22 +73,20 @@ function callback( $path = '', $site_id = 0 ) {
 		}
 
 		if ( isset( $args['id'] ) ) {
-			$logo_settings['id'] = (int) $args['id'];
-		}
-		if ( isset( $args['url'] ) ) {
-			$logo_settings['url'] = $args['url'];
-		}
-		if ( isset( $args['url'] ) || isset( $args['id'] ) ) {
-			update_option( 'site_logo', $logo_settings );
+			update_option( 'site_logo', (int) $args['id'] );
 		}
 
 		return $this->get_current_settings();
 	}
 
 	function get_current_settings() {
-		$logo_settings = get_option( 'site_logo' );
-		if ( ! is_array( $logo_settings ) ) {
-			$logo_settings = array();
+		$logo_settings = array();
+		$option        = get_option( 'site_logo' );
+		if ( is_numeric( $option ) ) {
+			$logo_settings = array(
+				'id'  => (int) $option,
+				'url' => wp_get_attachment_url( $option ),
+			);
 		}
 		return $logo_settings;
 	}

projects/plugins/jetpack/modules/theme-tools/site-logo.php

@@ -22,13 +22,18 @@
  * Activate the Site Logo plugin.
  *
  * @uses current_theme_supports()
- * @since 3.2
+ * @since 3.2.0
+ * @since 9.9.0 Uses Core site_logo option format universally.
  */
 function site_logo_init() {
-	// For transferring existing site logo from Jetpack -> Core
-	if ( current_theme_supports( 'custom-logo' ) && ! get_theme_mod( 'custom_logo' ) && $jp_logo = get_option( 'site_logo' ) ) {
-		set_theme_mod( 'custom_logo', $jp_logo['id'] );
-		delete_option( 'site_logo' );
+	// For transferring existing site logo from Jetpack -> Core.
+	if ( current_theme_supports( 'custom-logo' ) && ! get_theme_mod( 'custom_logo' ) && get_option( 'site_logo' ) ) {
+		$jp_logo = get_option( 'site_logo' );
+		// Is the Site Logo in the old Jetpack format?
+		if ( ! empty( $jp_logo['id'] ) ) {
+			set_theme_mod( 'custom_logo', $jp_logo['id'] );
+			update_option( 'site_logo', $jp_logo['id'] ); // This is the convention used by the Site Logo block, part of WP 5.8+.
+		}
 	}
 
 	// Only load our code if our theme declares support, and the standalone plugin is not activated.

projects/plugins/jetpack/modules/theme-tools/site-logo/inc/class-site-logo-control.php

@@ -87,7 +87,7 @@ public function enqueue() {
 	public function has_site_logo() {
 		$logo = get_option( 'site_logo' );
 
-		if ( empty( $logo['url'] ) ) {
+		if ( empty( $logo ) ) {
 			return false;
 		} else {
 			return true;

projects/plugins/jetpack/modules/theme-tools/site-logo/inc/class-site-logo.php

@@ -68,6 +68,8 @@ public function register_hooks() {
 	/**
 	 * Add our logo uploader to the Customizer.
 	 *
+	 * This uses the old Jetpack format. This function should only load in a context where `custom-logo` is not supported.
+	 *
 	 * @param object $wp_customize Customizer object.
 	 * @uses current_theme_supports()
 	 * @uses current_theme_supports()

projects/plugins/jetpack/modules/theme-tools/site-logo/inc/functions.php

@@ -18,15 +18,15 @@ function jetpack_get_site_logo( $show = 'url' ) {
 	$logo = site_logo()->logo;
 
 	// Return false if no logo is set
-	if ( ! isset( $logo['id'] ) || 0 == $logo['id'] ) {
+	if ( empty( $logo ) ) {
 		return false;
 	}
 
 	// Return the ID if specified, otherwise return the URL by default
 	if ( 'id' == $show ) {
-		return $logo['id'];
+		return $logo;
 	} else {
-		return esc_url_raw( set_url_scheme( $logo['url'] ) );
+		return esc_url_raw( set_url_scheme( wp_get_attachment_url( $logo ) ) );
 	}
 }
 
@@ -131,7 +131,8 @@ function jetpack_the_site_logo() {
 	$logo_id      = get_theme_mod( 'custom_logo' );
 	$jetpack_logo = site_logo()->logo;
 
-	// Use WP Core logo if present and is an id (of an attachment), otherwise use Jetpack's.
+	// Use WP Core logo if present, otherwise use Jetpack's.
+	// This shouldn't really ever fire anymore with the conversion code to Core's format, but leaving it just to be safe.
 	if ( ! is_numeric( $logo_id ) && isset( $jetpack_logo['id'] ) ) {
 		$logo_id = $jetpack_logo['id'];
 	}

projects/plugins/jetpack/tests/php/test_class.functions.opengraph.php

@@ -50,7 +50,7 @@ public function test_jetpack_og_get_site_icon_and_logo_url() {
 		$default_url = jetpack_og_get_image();
 
 		// Test Jetpack's Site Logo
-		update_option( 'site_logo', array( 'id' => $this->icon_id, 'url' => wp_get_attachment_url( $this->icon_id ) ) );
+		update_option( 'site_logo', $this->icon_id );
 		require_once JETPACK__PLUGIN_DIR . 'modules/theme-tools/site-logo/inc/functions.php';
 		require_once JETPACK__PLUGIN_DIR . 'modules/theme-tools/site-logo/inc/class-site-logo.php';