<!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>[32639] trunk/src/wp-includes/widgets.php: Add missing doc blocks to `widgets.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/32639">32639</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/32639","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-28 16:19:51 +0000 (Thu, 28 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 `widgets.php`.
Cleanup `@return` values.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2015-05-28 16:05:30 UTC (rev 32638)
+++ trunk/src/wp-includes/widgets.php 2015-05-28 16:19:51 UTC (rev 32639)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,14 +250,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->id = $this->id_base . '-' . $number;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 callback
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function _get_display_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array($this, 'display_callback');
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @return callback
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function _get_update_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array($this, 'update_callback');
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @return callback
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function _get_form_callback() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array($this, 'form_callback');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,6 +280,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</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_Customize_Manager $wp_customize
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if within the Customizer preview, false if not.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_preview() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,6 +354,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</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_registered_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $deprecated Not used.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function update_callback( $deprecated = 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,6 +596,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $wp_registered_widgets
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _register_widgets() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,15 +645,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_widget_controls = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @global array $wp_registered_widget_updates
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_widget_updates = array();
</span><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"> * Private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $_wp_sidebars_widgets
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_sidebars_widgets = array();
</span><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"> * Private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $_wp_deprecated_widgets_callbacks
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['_wp_deprecated_widgets_callbacks'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_widget_pages',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,9 +697,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_Widget_Factory
- * @uses WP_Widget_Factory
</del><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_Widget_Factory $wp_widget_factory
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $widget_class The name of a class that extends WP_Widget
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_widget($widget_class) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -697,9 +717,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Widget
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see WP_Widget_Factory
- * @uses WP_Widget_Factory
</del><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_Widget_Factory $wp_widget_factory
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $widget_class The name of a class that extends WP_Widget
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function unregister_widget($widget_class) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,6 +739,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see register_sidebar() The second parameter is documented by register_sidebar() and is the same here.
</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_registered_sidebars
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $number Optional. Number of sidebars to create. Default 1.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Array or string of arguments for building a sidebar.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -851,7 +873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.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">- * @uses $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name The ID of the sidebar when it was added.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,6 +895,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_registered_widgets Uses stored registered widgets.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_register_widget_defaults Retrieves widget defaults.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_registered_widget_updates
+ * @global array $_wp_deprecated_widgets_callbacks
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $id Widget ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Widget display title.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -885,7 +909,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $description Widget description for display in the widget administration
</span><span class="cx" style="display: block; padding: 0 10px"> * panel and/or theme.
</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 null Will return if `$output_callback` is empty after removing widget.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_register_sidebar_widget( $id, $name, $output_callback, $options = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates, $_wp_deprecated_widgets_callbacks;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,8 +960,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_registered_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $id Widget ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Widget description, if available. Null on failure to retrieve description.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|void Widget description, if available.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_widget_description( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_scalar($id) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -958,8 +983,10 @@
</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_registered_sidebars
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $id sidebar ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Sidebar description, if available. Null on failure to retrieve description.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|void Sidebar description, if available.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_sidebar_description( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_scalar($id) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,6 +1035,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Document `$options` as a hash notation, re: WP_Widget::__construct() cross-reference.
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo `$params` parameter?
</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_registered_widget_controls
+ * @global array $wp_registered_widget_updates
+ * @global array $wp_registered_widgets
+ * @global array $_wp_deprecated_widgets_callbacks
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $id Sidebar ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Sidebar display name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callback $control_callback Run when sidebar is displayed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,8 +1091,8 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_registered_widget_updates
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $wp_registered_widget_updates
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $id_base
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $update_callback
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $options
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1086,11 +1118,11 @@
</span><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"> * @global array $wp_registered_widget_controls
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $form_callback
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $options
</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 _register_widget_form_callback($id, $name, $form_callback, $options = array()) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widget_controls;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1129,7 +1161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $id Widget ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_unregister_widget_control($id) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return wp_register_widget_control($id, '', '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_register_widget_control( $id, '', '' );
</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">@@ -1141,6 +1173,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.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_registered_sidebars
+ * @global array $wp_registered_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $index Optional, default is 1. Index, name or ID of dynamic sidebar.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if widget sidebar was found and called. False if not found or not called.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1300,10 +1335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|string $index Index, name, or ID of the dynamic sidebar.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $did_one = apply_filters( 'dynamic_sidebar_has_widgets', $did_one, $index );
-
- return $did_one;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'dynamic_sidebar_has_widgets', $did_one, $index );
</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">@@ -1321,11 +1353,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.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 $callback Optional, Widget callback to check.
- * @param int $widget_id Optional, but needed for checking. Widget ID.
- * @param string $id_base Optional, the base ID of a widget created by extending WP_Widget.
- * @param bool $skip_inactive Optional, whether to check in 'wp_inactive_widgets'.
- * @return mixed false if widget is not active or id of sidebar in which the widget is active.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_registered_widgets
+ *
+ * @param string $callback Optional, Widget callback to check.
+ * @param int $widget_id Optional, but needed for checking. Widget ID.
+ * @param string $id_base Optional, the base ID of a widget created by extending WP_Widget.
+ * @param bool $skip_inactive Optional, whether to check in 'wp_inactive_widgets'.
+ * @return string|false False if widget is not active or id of sidebar in which the widget is active.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_active_widget($callback = false, $widget_id = false, $id_base = false, $skip_inactive = true) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_widgets;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1356,6 +1390,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.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_registered_widgets
+ * @global array $wp_registered_sidebars
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if using widgets. False, if not using widgets.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_dynamic_sidebar() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,6 +1444,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</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_sidebars_widgets
+ * @global array $sidebars_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool $deprecated Not used (argument deprecated).
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Upgraded list of widgets to version 3 array format when called from the admin.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1437,8 +1477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $sidebars_widgets An associative array of sidebars and their widgets.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sidebars_widgets = apply_filters( 'sidebars_widgets', $sidebars_widgets );
- return $sidebars_widgets;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'sidebars_widgets', $sidebars_widgets );
</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">@@ -1461,6 +1500,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</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_registered_sidebars
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_widget_defaults() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1479,6 +1520,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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_sidebars_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $base_name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_name
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $settings
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,6 +1583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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_Widget_Factory $wp_widget_factory
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $widget The widget's PHP class name (see default-widgets.php).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance Optional. The widget's instance settings. Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1586,6 +1631,8 @@
</span><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"> * Private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_widget_id_base($id) {
</span><span class="cx" style="display: block; padding: 0 10px"> return preg_replace( '/-[0-9]+$/', '', $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1596,6 +1643,8 @@
</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.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global array $sidebars_widgets
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_sidebars_changed() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $sidebars_widgets;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1611,9 +1660,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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_registered_sidebars
+ * @global array $sidebars_widgets
+ * @global array $wp_registered_widgets
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|bool $theme_changed Whether the theme was changed as a boolean. A value
</span><span class="cx" style="display: block; padding: 0 10px"> * of 'customize' defers updates for the Customizer.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|void
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function retrieve_widgets( $theme_changed = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
</span></span></pre>
</div>
</div>
</body>
</html>