WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-09 07:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Twenty Fifteen: Simplify twentyfifteen_the_custom_logo().

Browse Source 
See b72e3d8059
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
This commit is contained in:
Konstantin Obenland 2016-03-10 18:21:27 +00:00
parent 49ecfd6ae0
commit 91460e2af1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-content/themes/twentyfifteen/inc/template-tags.php
View File

@ -246,14 +246,12 @@ if ( ! function_exists( 'twentyfifteen_the_custom_logo' ) ) :
/** /**
* Displays the optional 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 * @since Twenty Fifteen 1.5
*/ */
function twentyfifteen_the_custom_logo() { function twentyfifteen_the_custom_logo() {
if ( ! function_exists( 'the_custom_logo' ) ) { if ( function_exists( 'the_custom_logo' ) ) {
return;
} else {
the_custom_logo(); the_custom_logo();
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.