From 91460e2af16cfb52f4c533afc9c93e53f7b352d8 Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Thu, 10 Mar 2016 18:21:27 +0000
Subject: [PATCH] Twenty Fifteen: Simplify `twentyfifteen_the_custom_logo()`.

See https://github.com/WordPress/twentysixteen/commit/b72e3d8059542542acbd0fdb15f54799109fbf82
See #35944.

Built from https://develop.svn.wordpress.org/trunk@36943


git-svn-id: http://core.svn.wordpress.org/trunk@36911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/inc/template-tags.php | 6 ++----
 wp-includes/version.php                               | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/inc/template-tags.php b/wp-content/themes/twentyfifteen/inc/template-tags.php
index 161f0caed5..fb6004ec38 100644
--- a/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -246,14 +246,12 @@ if ( ! function_exists( 'twentyfifteen_the_custom_logo' ) ) :
 /**
  * Displays the optional custom logo.
  *
- * Returns early if the custom logo is not available.
+ * Does nothing if the custom logo is not available.
  *
  * @since Twenty Fifteen 1.5
  */
 function twentyfifteen_the_custom_logo() {
-	if ( ! function_exists( 'the_custom_logo' ) ) {
-		return;
-	} else {
+	if ( function_exists( 'the_custom_logo' ) ) {
 		the_custom_logo();
 	}
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cfb68efaae..92b8e3be2b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta3-36942';
+$wp_version = '4.5-beta3-36943';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.