<!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>[30681] trunk/src/wp-includes: Improve various `@param` docs for `src/wp-includes/*`.</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/30681">30681</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/30681","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>2014-12-01 01:33:34 +0000 (Mon, 01 Dec 2014)</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'>Improve various `@param` docs for `src/wp-includes/*`.
See <a href="https://core.trac.wordpress.org/ticket/30224">#30224</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
<li><a href="#trunksrcwpincludescachephp">trunk/src/wp-includes/cache.php</a></li>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclassoembedphp">trunk/src/wp-includes/class-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>
<li><a href="#trunksrcwpincludesclasswperrorphp">trunk/src/wp-includes/class-wp-error.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpixrclientphp">trunk/src/wp-includes/class-wp-http-ixr-client.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesclasswpstylesphp">trunk/src/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>
<li><a href="#trunksrcwpincludesdatephp">trunk/src/wp-includes/date.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/bookmark.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</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 $bookmark
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|stdClass $bookmark
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional, default is 'raw'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|object Type returned depends on $output value.
</span></span></pre></div>
<a id="trunksrcwpincludescachephp"></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/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cache.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/cache.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,6 +664,9 @@
</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"> * @access protected
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $key
+ * @param string $group
+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _exists( $key, $group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) );
</span></span></pre></div>
<a id="trunksrcwpincludescanonicalphp"></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/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/canonical.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,6 +492,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $query_string
+ * @param array $args_to_check
+ * @param string $url
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The altered query string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) {
</span></span></pre></div>
<a id="trunksrcwpincludescapabilitiesphp"></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/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/capabilities.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,6 +611,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Magic method for checking the existence of a certain custom field
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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">+ * @param string $key
+ * @return bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __isset( $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id' == $key ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -631,6 +633,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Magic method for accessing custom fields
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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">+ * @param string $key
+ * @return mixed
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'id' == $key ) {
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></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/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/category-template.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +458,7 @@
</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|array $args Optional. Override default arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string HTML content only if 'echo' argument is 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null|string HTML content only if 'echo' argument is 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_list_categories( $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,8 +586,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.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 array|string $args Optional. Override default arguments.
- * @return array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string|null $args Optional. Override default arguments.
+ * @return null|false Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_tag_cloud( $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,7 +1321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $before Optional. Before list.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $sep Optional. Separate items using this.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $after Optional. After list.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null|bool False on WordPress error. Returns null when displaying.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null False on WordPress error. Returns null when displaying.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></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/class-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-http.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Request arguments
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url URL to Request
</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|bool Class name for the first transport that claims to support the request. False if no transport claims to support the request.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _get_first_available_transport( $args, $url = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2080,7 +2080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $raw String to compress.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $level Optional, default is 9. Compression level, 9 is highest.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $supports Optional, not used. When implemented it will choose the right compression based on what the server supports.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool False on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false False on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function compress( $raw, $level = 9, $supports = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return gzdeflate( $raw, $level );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2180,6 +2180,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">+ * @param string $url
+ * @param array $args
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Types of encoding to accept.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function accept_encoding( $url, $args ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclassoembedphp"></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/class-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-oembed.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-oembed.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL to the content that should be attempted to be embedded.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional arguments. Usually passed from a shortcode.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_html( $url, $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $provider = $this->get_provider( $url, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $data A data object result from an oEmbed provider.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL to the content that is desired to be embedded.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|string False on error, otherwise the HTML needed to embed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string False on error, otherwise the HTML needed to embed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data2html( $data, $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_object( $data ) || empty( $data->type ) )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></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/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-editor.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,6 +250,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::editor_settings($editor_id, $set);
</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">+ /**
+ * @param string $editor_id
+ * @param array $set
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function editor_settings($editor_id, $set) {
</span><span class="cx" style="display: block; padding: 0 10px"> $first_run = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,7 +760,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $mce_locale The locale used for the editor.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $json_only optional Whether to include the Javascript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return The translation object, JSON encoded.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Translation object, JSON encoded.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,7 +1332,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array Results.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|array Results.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wp_link_query( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pts = get_post_types( array( 'public' => true ), 'objects' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpembedphp"></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/class-wp-embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-embed.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Conditionally makes a hyperlink based on an internal class variable.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url URL to potentially be linked.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool Linked URL or the original URL. False if 'return_false_on_fail' is true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string Linked URL or the original URL. False if 'return_false_on_fail' is true.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function maybe_make_link( $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->return_false_on_fail ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswperrorphp"></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/class-wp-error.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-error.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-error.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->error_data[$code] = $data;
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Removes the specified error.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpixrclientphp"></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/class-wp-http-ixr-client.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-ixr-client.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-http-ixr-client.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $error;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @param string $server
+ * @param string|bool $path
+ * @param int|bool $port
+ * @param int $timeout
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function __construct($server, $path = false, $port = false, $timeout = 15) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Assume we have been given a URL instead
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorgdphp"></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/class-wp-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</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|int $src The source file or Attachment ID.
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $src_x The start x position to crop from.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $src_y The start y position to crop from.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $src_w The width to crop.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,8 +354,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</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 $destfilename
- * @param string $mime_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|null $filename
+ * @param string|null $mime_type
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function save( $filename = null, $mime_type = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,6 +369,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $saved;
</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">+ /**
+ * @param resource $image
+ * @param string|null $filename
+ * @param string|null $mime_type
+ * @return WP_Error|array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function _save( $image, $filename = null, $mime_type = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></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/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-theme.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1033,7 +1033,7 @@
</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 public
</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 True if the textdomain was successfully loaded or has already been loaded. False if
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool If the textdomain was successfully loaded or has already been loaded. False if
</ins><span class="cx" style="display: block; padding: 0 10px"> * no textdomain was specified in the file headers, or if the domain could not be loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function load_textdomain() {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></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/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4630,6 +4630,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return strval($post_ID);
</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">+ /**
+ * @param integer $post_ID
+ * @param array $enclosure
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function add_enclosure_if_new( $post_ID, $enclosure ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] . "\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5914,6 +5918,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $pingbacks;
</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">+ /**
+ * @param integer $code
+ * @param string $message
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function pingback_error( $code, $message ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the XML-RPC pingback error return.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpstylesphp"></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/class.wp-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-styles.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/class.wp-styles.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,6 +39,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_ref_array( 'wp_default_styles', array(&$this) );
</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">+ /**
+ * @param string $handle
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function do_item( $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !parent::do_item($handle) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,6 +123,10 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @param string $handle
+ * @param string $code
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function add_inline_style( $handle, $code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +142,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->add_data( $handle, 'after', $after );
</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">+ /**
+ * @param string $handle
+ * @param bool $echo
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function print_inline_style( $handle, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $output = $this->get_data( $handle, 'after' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,6 +165,12 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @param mixed $handles
+ * @param bool $recursion
+ * @param mixed $group
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function all_deps( $handles, $recursion = false, $group = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r = parent::all_deps( $handles, $recursion );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$recursion ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +186,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $r;
</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">+ /**
+ * @param string $src
+ * @param string $ver
+ * @param string $handle
+ * @return string
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function _css_href( $src, $ver, $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $src = $this->base_url . $src;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,6 +212,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return esc_url( $src );
</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">+ /**
+ * @param string $src
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function in_default_dir($src) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->default_dirs )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></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/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/comment-template.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,7 +707,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $deprecated Not Used.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $deprecated_2 Not Used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $deprecated_2 Not Used.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comments_link( $deprecated = '', $deprecated_2 = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $deprecated ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1353,7 +1353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comment Comment being replied to. Default current comment.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $post Post ID or WP_Post object the comment is going to be displayed on.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default current post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return mixed Link to show comment form, if successful. False, if comments are closed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return null|false|string Link to show comment form, if successful. False, if comments are closed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1466,7 +1466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $post Optional. Post ID or WP_Post object the comment is going to be displayed on.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default current post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null|string Link to show comment form, if successful. False, if comments are closed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_post_reply_link($args = array(), $post = null) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/comment.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1745,7 +1745,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comment_id Comment ID
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_comment_status($comment_id) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment($comment_id);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2298,7 +2298,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $do_deferred Whether to process previously deferred post comment counts
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool True on success, false on failure
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|null True on success, false on failure
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_comment_count($post_id, $do_deferred=false) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $_deferred = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2376,7 +2376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url URL to ping.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $deprecated Not Used.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|string False on failure, string containing URI on success.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string False on failure, string containing URI on success.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function discover_pingback_server_uri( $url, $deprecated = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $deprecated ) )
</span></span></pre></div>
<a id="trunksrcwpincludescronphp"></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/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cron.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/cron.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $recurrence How often the event should recur.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook to execute when cron is run.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Arguments to pass to the hook's callback function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|null False on failure, null when complete with scheduling event.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null False on failure, null when complete with scheduling event.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
</span><span class="cx" style="display: block; padding: 0 10px"> $crons = _get_cron_array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $recurrence How often the event should recur.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $hook Action hook to execute when cron is run.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Arguments to pass to the hook's callback function.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|null False on failure. Null when event is rescheduled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null False on failure. Null when event is rescheduled.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $crons = _get_cron_array();
</span></span></pre></div>
<a id="trunksrcwpincludesdatephp"></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/date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/date.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/date.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</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 array $query A tax_query query clause.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $queries
+ * @param array $parent_query
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Sanitized queries.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function sanitize_query( $queries, $parent_query = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,7 +779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $compare The compare operator to use
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $value The value
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|int|false The value to be used in SQL or false on error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false|int The value to be used in SQL or false on error.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function build_value( $compare, $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $value ) )
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/deprecated.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $category The category to use.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $args
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|null
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_linksbyname($category, $args = '') {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,7 +578,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * underscore the order will be reversed. You can also specify 'rand' as the
</span><span class="cx" style="display: block; padding: 0 10px"> * order which will return links in a random order.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $show_description Whether to show the description if show_images=false/not defined.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $limit Limit to X entries. If not specified, all entries are shown.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $limit Limit to X entries. If not specified, all entries are shown.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $show_updated Whether to show last updated timestamp
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -627,7 +627,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $feed_image
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $exclude
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $hierarchical
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
</span><span class="cx" style="display: block; padding: 0 10px"> $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,7 +646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_list_categories()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $args
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|null|string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_list_cats($args = '') {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,7 +1156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $cat_ID
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|null
</del><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_category_rss_link($echo = false, $cat_ID = 1) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.5', 'get_category_feed_link()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1178,7 +1178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $echo
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $author_id
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|null
</del><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_author_rss_link($echo = false, $author_id = 1) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.5', 'get_author_feed_link()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1657,7 +1657,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated Use get_the_author_meta('ID')
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_the_author_meta()
</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 int The author's ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|int The author's ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_author_ID() {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1701,7 +1701,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see the_content_feed()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $more_link_text Optional. Text to display when more content is available but not displayed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|bool $stripteaser Optional. Default is 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $stripteaser Optional. Default is 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $more_file Optional.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $cut Optional. Amount of words to keep for the content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $encode_html Optional. How to encode the content.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1960,7 +1960,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $id Optional. Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $fullsize Optional, default to false. Whether to have full size image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $max_dims Optional. Dimensions of image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string HTML content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string HTML content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2017,7 +2017,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $id Optional. Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $fullsize Optional, default to false. Whether to have full size image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $max_dims Optional. Dimensions of image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3041,7 +3041,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated Use remove_theme_support('custom-header')
</span><span class="cx" style="display: block; padding: 0 10px"> * @see remove_theme_support()
</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 bool Whether support was removed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return null|bool Whether support was removed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_custom_image_header() {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.4', 'remove_theme_support( \'custom-header\' )' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3078,7 +3078,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @see add_custom_background()
</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 bool Whether support was removed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return null|bool Whether support was removed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_custom_background() {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.4', 'remove_theme_support( \'custom-background\' )' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3292,7 +3292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $postid Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return object|array Post object or array holding post contents and information
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Post|null Post object or array holding post contents and information
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.5', 'get_post()' );
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></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/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/feed.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|string false on failure or guid for comment on success.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string false on failure or guid for comment on success.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_guid($comment_id = null) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment($comment_id);
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2014-12-01 00:59:43 UTC (rev 30680)
+++ trunk/src/wp-includes/formatting.php 2014-12-01 01:33:34 UTC (rev 30681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string The text which is to be encoded.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $charset Optional. The character encoding of the string. Default is false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param boolean $double_encode Optional. Whether to encode existing html entities. Default is false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The encoded text with HTML entities.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1317,7 +1317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby Order by string to be checked.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool Returns the order by clause if it is a match, false otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return false|string Returns the order by clause if it is a match, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_sql_orderby( $orderby ){
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match('/^\s*([a-z0-9_]+(\s+(ASC|DESC))?(\s*,\s*|\s*$))+|^\s*RAND\(\s*\)\s*$/i', $orderby, $obmatches);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2219,7 +2219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $match The preg_replace_callback matches array
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array Converted chars
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Converted chars
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_iso_convert( $match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return chr( hexdec( strtolower( $match[1] ) ) );
</span></span></pre>
</div>
</div>
</body>
</html>