<!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>[48193] trunk/src/wp-includes/option.php: Docs: Synchronize some documentation for functions in `wp-includes/option.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 { white-space: pre-line; 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/48193">48193</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/48193","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-27 16:54:29 +0000 (Sat, 27 Jun 2020)</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'>Docs: Synchronize some documentation for functions in `wp-includes/option.php`.
See <a href="https://core.trac.wordpress.org/ticket/49572">#49572</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesoptionphp"></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/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2020-06-27 16:32:57 UTC (rev 48192)
+++ trunk/src/wp-includes/option.php 2020-06-27 16:54:29 UTC (rev 48193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,20 +40,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$option`, refers to the option 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">- * Returning a truthy value from the filter will short-circuit retrieving
- * the option value, returning the passed value instead.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returning a truthy value from the filter will effectively short-circuit retrieval
+ * and return the passed value instead.
</ins><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"> * @since 4.4.0 The `$option` parameter was added.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0 The `$default` parameter was added.
</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 bool|mixed $pre_option The value to return instead of the option value. This differs from
- * `$default`, which is used as the fallback value in the event the option
- * doesn't exist elsewhere in get_option(). Default false (to skip past the
- * short-circuit).
- * @param string $option Option name.
- * @param mixed $default The fallback value to return if the option does not exist.
- * Default is false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $pre_option The value to return instead of the option value. This differs
+ * from `$default`, which is used as the fallback value in the event
+ * the option doesn't exist elsewhere in get_option().
+ * Default false (to skip past the short-circuit).
+ * @param string $option Option name.
+ * @param mixed $default The fallback value to return if the option does not exist.
+ * Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $pre = apply_filters( "pre_option_{$option}", false, $option, $default );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,6 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_installing() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent non-existent options from triggering multiple queries.
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the default value for an option.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $notoptions ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $notoptions[ $option ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,6 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $row ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $row->option_value;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,6 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $alloptions Array with all options.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = apply_filters( 'pre_cache_alloptions', $alloptions );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( 'alloptions', $alloptions, 'options' );
</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">@@ -393,6 +397,7 @@
</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"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $notoptions[ $option ] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,6 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The new option value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'updated_option', $option, $old_value, $value );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -482,6 +488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the option doesn't already exist.
</span><span class="cx" style="display: block; padding: 0 10px"> // We can check the 'notoptions' cache before we ask for a DB query.
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( 'notoptions', 'options' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/option.php */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( "default_option_{$option}", false, $option, false ) !== get_option( $option ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,6 +526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This option exists now.
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( 'notoptions', 'options' ); // Yes, again... we need it to be fresh.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $notoptions[ $option ] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,6 +554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value of the option.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'added_option', $option, $value );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -585,6 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'delete_option', $option );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_installing() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'yes' === $row->autoload ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions( true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,6 +606,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $option, 'options' );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</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">@@ -617,8 +628,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option Name of the deleted option.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'deleted_option', $option );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,6 +662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_timeout = '_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $option = '_transient_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = delete_option( $option );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( $option_timeout );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,12 +697,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_transient( $transient ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the value of an existing transient.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the value of an existing transient before it is retrieved.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$transient`, refers to the transient name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returning a truthy value from the filter will effectively short-circuit retrieval
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * of the transient, returning the passed value instead.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and return the passed value instead.
</ins><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"> * @since 4.4.0 The `$transient` parameter was added
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,10 +709,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $pre_transient The default value to return if the transient does not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> * Any value other than false will short-circuit the retrieval
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * of the transient, and return the returned value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * of the transient, and return that value.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $transient Transient name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $pre = apply_filters( "pre_transient_{$transient}", false, $transient );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $pre ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $pre;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,6 +807,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_timeout = '_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_option = '_transient_' . $transient;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === get_option( $transient_option ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $autoload = 'yes';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $expiration ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -803,6 +819,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If expiration is requested, but the transient has no timeout option,
</span><span class="cx" style="display: block; padding: 0 10px"> // delete, then re-create transient rather than update.
</span><span class="cx" style="display: block; padding: 0 10px"> $update = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $expiration ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === get_option( $transient_timeout ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( $transient_option );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,6 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $transient_timeout, time() + $expiration );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = update_option( $transient_option, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,6 +866,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'setted_transient', $transient, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -1233,7 +1252,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters an existing network option before it is retrieved.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the value of an existing network option before it is retrieved.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$option`, refers to the option name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1246,14 +1265,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 The `$network_id` parameter was added.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0 The `$default` parameter was added.
</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 mixed $pre_option The value to return instead of the option value. This differs from
- * `$default`, which is used as the fallback value in the event the
- * option doesn't exist elsewhere in get_network_option(). Default
- * is false (to skip past the short-circuit).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $pre_option The value to return instead of the option value. This differs
+ * from `$default`, which is used as the fallback value in the event
+ * the option doesn't exist elsewhere in get_network_option().
+ * Default false (to skip past the short-circuit).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $option Option name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $network_id ID of the network.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $default The fallback value to return if the option does not exist.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default is false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $pre = apply_filters( "pre_site_option_{$option}", false, $option, $network_id, $default );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1304,6 +1323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $notoptions ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $notoptions[ $option ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1393,6 +1413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the option doesn't already exist.
</span><span class="cx" style="display: block; padding: 0 10px"> // We can check the 'notoptions' cache before we ask for a DB query.
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== get_network_option( $network_id, $option, false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1419,6 +1440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This option exists now.
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // Yes, again... we need it to be fresh.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $notoptions[ $option ] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1621,6 +1643,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions_key = "$network_id:notoptions";
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $notoptions[ $option ] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1711,10 +1734,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_timeout = '_site_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $option = '_site_transient_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = delete_site_option( $option );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_site_option( $option_timeout );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</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">@@ -1746,7 +1771,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_site_transient( $transient ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the value of an existing site transient.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the value of an existing site transient before it is retrieved.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$transient`, refers to the transient name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1758,7 +1783,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $pre_site_transient The default value to return if the site transient does not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> * Any value other than false will short-circuit the retrieval
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * of the transient, and return the returned value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * of the transient, and return that value.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $transient Transient name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $pre = apply_filters( "pre_site_transient_{$transient}", false, $transient );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1853,6 +1878,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_timeout = '_site_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $option = '_site_transient_' . $transient;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === get_site_option( $option ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $expiration ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( $transient_timeout, time() + $expiration );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1865,6 +1891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = update_site_option( $option, $value );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $result ) {
</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">@@ -1892,6 +1919,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'setted_site_transient', $transient, $value, $expiration );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -2143,6 +2171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option_name Setting name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'register_setting_args', $args, $defaults, $option_group, $option_name );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Require an item schema when registering settings with an array type.
</span></span></pre>
</div>
</div>
</body>
</html>