Merge "Use svg for the logo if applicable"

3 years ago · 2c22fc0183
parent d6e84d72ff 5087e5781e
commit 2c22fc0183
1 changed files with 7 additions and 5 deletions
--- a/includes/TimelessTemplate.php
+++ b/includes/TimelessTemplate.php
@ -531,12 +531,14 @@ class TimelessTemplate extends BaseTemplate {
 		}
 		if ( $part !== 'text' ) {
 			$logoImage = $this->getLogoImage( $config->get( 'TimelessLogo' ) );
-			if ( $logoImage === false && isset( $logos['icon'] ) ) {
-				$logoSrc = $logos['icon'];
+			if ( $logoImage === false ) {
+				$logoSrc = $logos['svg'] ?: $logos['icon'] ?: '';
+				if ( $logoSrc !== '' ) {
 					$logoImage = Html::element( 'img', [
 						'src' => $logoSrc,
 					] );
 				}
+			}

 			$html .= Html::rawElement(
 				'a',