Keep priority of Icons (only change fallbacks) (#903)

* keep icon prio the same as before

and only replace the icon, because we can not assume that a logo is always square!?!

* remove logo completely

includes/model/class-blog.php

@@ -207,7 +207,7 @@ public function get_preferred_username() {
 	 */
 	public function get_icon() {
 		// try site_logo, falling back to site_icon, first
-		$icon_id = get_option( 'site_logo', get_option( 'site_icon' ) );
+		$icon_id = get_option( 'site_icon' );
 
 		// try custom logo second
 		if ( ! $icon_id ) {
@@ -419,7 +419,7 @@ public function update_icon( $value ) {
 		if ( ! wp_attachment_is_image( $value ) ) {
 			return false;
 		}
-		return \update_option( 'site_logo', $value ) && \update_option( 'site_icon', $value );
+		return \update_option( 'site_icon', $value );
 	}
 
 	/**