<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32629] trunk/src/wp-includes/theme.php: Add missing doc blocks to `theme.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32629">32629</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32629","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-27 22:20:48 +0000 (Wed, 27 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Add missing doc blocks to `theme.php`.
Correct some `@return` values.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2015-05-27 22:03:52 UTC (rev 32628)
+++ trunk/src/wp-includes/theme.php 2015-05-27 22:20:48 UTC (rev 32629)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,6 +14,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ * @staticvar array $_themes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args The search arguments. Optional.
</span><span class="cx" style="display: block; padding: 0 10px"> * - errors mixed True to return themes with errors, false to return themes without errors, null
</span><span class="cx" style="display: block; padding: 0 10px"> * to return all themes. Defaults to false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * to return only network-allowed themes. Null to return all themes. Defaults to null.
</span><span class="cx" style="display: block; padding: 0 10px"> * - blog_id int (Multisite) The blog ID used to calculate which themes are allowed. Defaults to 0,
</span><span class="cx" style="display: block; padding: 0 10px"> * synonymous for the current blog.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return Array of WP_Theme objects.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array Array of WP_Theme objects.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_themes( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_theme_directories;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,9 +87,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet Directory name for the theme. Optional. Defaults to current theme.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_root Absolute path of the theme root to look in. Optional. If not specified, get_raw_theme_root()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * is used to calculate the theme root for the $stylesheet provided (or current theme).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * is used to calculate the theme root for the $stylesheet provided (or current theme).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_theme( $stylesheet = null, $theme_root = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,6 +248,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Locale $wp_locale
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_locale_stylesheet_uri() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,6 +345,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|string An array of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_theme_roots() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,6 +368,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,8 +402,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ * @staticvar array $found_themes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool $force Optional. Whether to force a new directory scan. Defaults to false.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array Valid themes found
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|false Valid themes found
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function search_theme_directories( $force = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_theme_directories;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,6 +532,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet_or_template The stylesheet or template name of the theme
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Theme path.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,10 +566,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default is to leverage the main theme root.
- * @param string $theme_root Optional. The theme root for which calculations will be based, preventing
- * the need for a get_raw_theme_root() call.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default is to leverage the main theme root.
+ * @param string $theme_root Optional. The theme root for which calculations will be based, preventing
+ * the need for a get_raw_theme_root() call.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Themes URI.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,8 +615,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet_or_template The stylesheet or template name of the theme
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $skip_cache Optional. Whether to skip the cache. Defaults to false, meaning the cache is used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $skip_cache Optional. Whether to skip the cache.
+ * Defaults to false, meaning the cache is used.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Theme root
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,6 +777,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_theme_directories
+ * @global WP_Customize_Manager $wp_customize
+ * @global array $sidebars_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet Stylesheet name
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function switch_theme( $stylesheet ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -871,7 +896,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|null Theme modifications.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|void Theme modifications.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_theme_mods() {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_slug = get_option( 'stylesheet' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,8 +909,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( "theme_mods_$theme_slug", $mods );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( "mods_$theme_name" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $mods;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $mods;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,7 +923,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $name Theme modification name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $name Theme modification name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool|string $default
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -933,8 +958,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $name Theme modification name.
- * @param mixed $value theme modification value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $name Theme modification name.
+ * @param mixed $value Theme modification value.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function set_theme_mod( $name, $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mods = get_theme_mods();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -967,7 +992,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Theme modification name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_theme_mod( $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mods = get_theme_mods();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -977,9 +1001,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $mods[ $name ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $mods ) )
- return remove_theme_mods();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $mods ) ) {
+ remove_theme_mods();
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme = get_option( 'stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( "theme_mods_$theme", $mods );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1031,7 +1056,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'blank' != $text_color;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'blank' !== $text_color;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1073,9 +1098,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Path to header image
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_wp_default_headers
+ * @staticvar object $_wp_random_header
+ *
+ * @return object
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> function _get_random_header_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> static $_wp_random_header;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1113,7 +1140,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Path to header image
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> function get_random_header_image() {
</span><span class="cx" style="display: block; padding: 0 10px"> $random_image = _get_random_header_data();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $random_image->url ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1199,6 +1225,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_wp_default_headers
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return object
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_custom_header() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,6 +1268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_wp_default_headers
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $headers Array of headers keyed by a string id. The ids point to arrays containing 'url', 'thumbnail_url', and 'description' keys.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_default_headers( $headers ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1257,6 +1287,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see register_default_headers()
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_wp_default_headers
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $header The header string id (key of array) to remove, or an array thereof.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|void A single header returns true on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> * There is currently no return value for multiple headers.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1380,11 +1412,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $editor_styles
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defaults to 'editor-style.css'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Defaults to 'editor-style.css'
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_editor_style( $stylesheet = 'editor-style.css' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'editor-style' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_admin() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1406,6 +1439,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $editor_styles
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false if there were no stylesheets to remove.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_editor_styles() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1422,7 +1457,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global $editor_styles Registered editor stylesheets
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $editor_styles Registered editor stylesheets
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array If registered, a list of editor stylesheet URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1474,6 +1509,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_wp_theme_features
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature The feature being added.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void|bool False on failure, void otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1647,6 +1684,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global Custom_Image_Header $custom_image_header
+ * @global Custom_Background $custom_background
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _custom_header_background_just_in_time() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $custom_image_header, $custom_background;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1684,6 +1724,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $_wp_theme_features
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature the feature to check
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The array of extra arguments or the value for the registered feature.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1717,7 +1759,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @see add_theme_support()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature the feature being added
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null|bool Whether feature was removed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|void Whether feature was removed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_theme_support( $feature ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Blacklist: for internal registrations not used directly by themes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1732,6 +1774,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $_wp_theme_features
+ * @global Custom_Image_Header $custom_image_header
+ * @global Custom_Background $custom_background
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _remove_theme_support( $feature ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1777,8 +1824,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks a theme's support for a given feature
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $_wp_theme_features
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $feature the feature being checked
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return boolean
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function current_theme_supports( $feature ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1931,6 +1981,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when ?wp_customize=on or on wp-admin/customize.php.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global WP_Customize_Manager $wp_customize
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_customize_include() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1949,8 +2001,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_customize_loader_settings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_scripts;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $admin_origin = parse_url( admin_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $home_origin = parse_url( home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1972,6 +2022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_scripts = wp_scripts();
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $wp_scripts->get_data( 'customize-loader', 'data' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $data )
</span><span class="cx" style="display: block; padding: 0 10px"> $script = "$data\n$script";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1985,7 +2036,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $stylesheet Optional. Theme to customize. Defaults to current theme.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The theme's stylesheet will be urlencoded if necessary.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The theme's stylesheet will be urlencoded if necessary.
+ * @return string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_customize_url( $stylesheet = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = admin_url( 'customize.php' );
</span></span></pre>
</div>
</div>
</body>
</html>