Merge "Use svg for the logo if applicable"

includes/TimelessTemplate.php

@@ -531,11 +531,13 @@ class TimelessTemplate extends BaseTemplate {
 		}
 		if ( $part !== 'text' ) {
 			$logoImage = $this->getLogoImage( $config->get( 'TimelessLogo' ) );
-			if ( $logoImage === false && isset( $logos['icon'] ) ) {
+			if ( $logoImage === false ) {
-				$logoSrc = $logos['icon'];
+				$logoSrc = $logos['svg'] ?: $logos['icon'] ?: '';
-				$logoImage = Html::element( 'img', [
+				if ( $logoSrc !== '' ) {
-					'src' => $logoSrc,
+					$logoImage = Html::element( 'img', [
-				] );
+						'src' => $logoSrc,
+					] );
+				}
 			}
 
 			$html .= Html::rawElement(