<!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>[23191] trunk: its <=> it's in documentation, along with a rogue the, The, and looses.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23191">23191</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2012-12-20 15:55:32 +0000 (Thu, 20 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>its <=> it's in documentation, along with a rogue the, The, and looses. props trepmal. fixes <a href="http://core.trac.wordpress.org/ticket/22665">#22665</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpfilesystembasephp">trunk/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpsocketsphp">trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpplugininstalllisttablephp">trunk/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeinstalllisttablephp">trunk/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincwidgetsphp">trunk/wp-content/themes/twentyeleven/inc/widgets.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesfeedatomcommentsphp">trunk/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunkwpincludesjscropcroppercss">trunk/wp-includes/js/crop/cropper.css</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpdialogsjspopupjs">trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesrssphp">trunk/wp-includes/rss.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-base.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-base.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-filesystem-base.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> continue; //We want this to be caught by the next code block.
</span><span class="cx">
</span><span class="cx"> //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
</span><del>- // If its found, change into it and follow through looking for it.
</del><ins>+ // If it's found, change into it and follow through looking for it.
</ins><span class="cx"> // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
</span><span class="cx"> // If it reaches the end, and still cant find it, it'll return false for the entire function.
</span><span class="cx"> if ( isset($files[ $key ]) ){
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> if ( ! $recursive && $this->is_dir($file) )
</span><span class="cx"> return @rmdir($file);
</span><span class="cx">
</span><del>- //At this point its a folder, and we're in recursive mode
</del><ins>+ //At this point it's a folder, and we're in recursive mode
</ins><span class="cx"> $file = trailingslashit($file);
</span><span class="cx"> $filelist = $this->dirlist($file, true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if ( ! $this->ftp->fget($temphandle, $file) ) {
</span><span class="cx"> fclose($temphandle);
</span><span class="cx"> unlink($temp);
</span><del>- return ''; //Blank document, File does exist, Its just blank.
</del><ins>+ return ''; //Blank document, File does exist, It's just blank.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fseek($temphandle, 0); //Skip back to the start of the file being written to
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> var $_pagination;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Constructor. The child class should call this constructor from it's own constructor
</del><ins>+ * Constructor. The child class should call this constructor from its own constructor
</ins><span class="cx"> *
</span><span class="cx"> * @param array $args An associative array with information about the current table
</span><span class="cx"> * @access protected
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugin-install-list-table.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> $tabs = apply_filters( 'install_plugins_tabs', $tabs );
</span><span class="cx"> $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
</span><span class="cx">
</span><del>- // If a non-valid menu tab has been selected, And its not a non-menu action.
</del><ins>+ // If a non-valid menu tab has been selected, And it's not a non-menu action.
</ins><span class="cx"> if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
</span><span class="cx"> $tab = key( $tabs );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> $tabs = apply_filters( 'install_themes_tabs', $tabs );
</span><span class="cx"> $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
</span><span class="cx">
</span><del>- // If a non-valid menu tab has been selected, And its not a non-menu action.
</del><ins>+ // If a non-valid menu tab has been selected, And it's not a non-menu action.
</ins><span class="cx"> if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
</span><span class="cx"> $tab = key( $tabs );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> $source = trailingslashit($source) . trailingslashit($source_files[0]);
</span><span class="cx"> elseif ( count($source_files) == 0 )
</span><span class="cx"> return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The plugin contains no files.' ) ); //There are no files?
</span><del>- else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
</del><ins>+ else //It's only a single file, the upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
</ins><span class="cx"> $source = trailingslashit($source);
</span><span class="cx">
</span><span class="cx"> //Hook ability to change the source file location..
</span><span class="lines">@@ -615,11 +615,11 @@
</span><span class="cx"> $plugins_dir = $wp_filesystem->wp_plugins_dir();
</span><span class="cx"> $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
</span><span class="cx">
</span><del>- if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished.
</del><ins>+ if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
</ins><span class="cx"> return $removed;
</span><span class="cx">
</span><span class="cx"> // If plugin is in its own directory, recursively delete the directory.
</span><del>- if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder
</del><ins>+ if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
</ins><span class="cx"> $deleted = $wp_filesystem->delete($this_plugin_dir, true);
</span><span class="cx"> else
</span><span class="cx"> $deleted = $wp_filesystem->delete($plugins_dir . $plugin);
</span><span class="lines">@@ -1597,7 +1597,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if its a local file to the Upgrade/Installer functions.
</del><ins>+ * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if it's a local file to the Upgrade/Installer functions.
</ins><span class="cx"> *
</span><span class="cx"> * @TODO More Detailed docs, for methods as well.
</span><span class="cx"> *
</span><span class="lines">@@ -1615,7 +1615,7 @@
</span><span class="cx"> if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
</span><span class="cx"> wp_die(__('Please select a file'));
</span><span class="cx">
</span><del>- //Handle a newly uploaded file, Else assume its already been uploaded
</del><ins>+ //Handle a newly uploaded file, Else assume it's already been uploaded
</ins><span class="cx"> if ( ! empty($_FILES) ) {
</span><span class="cx"> $overrides = array( 'test_form' => false, 'test_type' => false );
</span><span class="cx"> $file = wp_handle_upload( $_FILES[$form], $overrides );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> $actions = apply_filters( 'user_row_actions', $actions, $user_object );
</span><span class="cx"> $edit .= $this->row_actions( $actions );
</span><span class="cx">
</span><del>- // Set up the checkbox ( because the user is editable, otherwise its empty )
</del><ins>+ // Set up the checkbox ( because the user is editable, otherwise it's empty )
</ins><span class="cx"> $checkbox = '<label class="screen-reader-text" for="cb-select-' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
</span><span class="cx"> . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' />";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/file.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -926,7 +926,7 @@
</span><span class="cx"> $credentials['connection_type'] = 'ftps';
</span><span class="cx"> else if ( !empty($_POST['connection_type']) )
</span><span class="cx"> $credentials['connection_type'] = stripslashes($_POST['connection_type']);
</span><del>- else if ( !isset($credentials['connection_type']) ) //All else fails (And its not defaulted to something else saved), Default to FTP
</del><ins>+ else if ( !isset($credentials['connection_type']) ) //All else fails (And it's not defaulted to something else saved), Default to FTP
</ins><span class="cx"> $credentials['connection_type'] = 'ftp';
</span><span class="cx">
</span><span class="cx"> if ( ! $error &&
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-admin/includes/plugin.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx">
</span><span class="cx"> $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) );
</span><span class="cx"> // If plugin is in its own directory, recursively delete the directory.
</span><del>- if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder
</del><ins>+ if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
</ins><span class="cx"> $deleted = $wp_filesystem->delete($this_plugin_dir, true);
</span><span class="cx"> else
</span><span class="cx"> $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file);
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/widgets.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/widgets.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-content/themes/twentyeleven/inc/widgets.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param array An array of standard parameters for widgets in this theme
</span><span class="cx"> * @param array An array of settings for this widget instance
</span><del>- * @return void Echoes it's output
</del><ins>+ * @return void Echoes its output
</ins><span class="cx"> **/
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="cx"> $cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/class-http.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> unset( $homeURL );
</span><span class="cx">
</span><span class="cx"> // If we are streaming to a file but no filename was given drop it in the WP temp dir
</span><del>- // and pick it's name using the basename of the $url
</del><ins>+ // and pick its name using the basename of the $url
</ins><span class="cx"> if ( $r['stream'] && empty( $r['filename'] ) )
</span><span class="cx"> $r['filename'] = get_temp_dir() . basename( $url );
</span><span class="cx">
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx"> if ( !empty($wildcard_regex) )
</span><span class="cx"> return !preg_match($wildcard_regex, $check['host']);
</span><span class="cx"> else
</span><del>- return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If its in the array, then we can't access it.
</del><ins>+ return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> // Start off with the Absolute URL path
</span><span class="cx"> $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
</span><span class="cx">
</span><del>- // If the it's a root-relative path, then great
</del><ins>+ // If it's a root-relative path, then great
</ins><span class="cx"> if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
</span><span class="cx"> $path = $relative_url_parts['path'];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/comment.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -1673,7 +1673,7 @@
</span><span class="cx"> if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file)
</del><ins>+ // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
</ins><span class="cx"> $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) )
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/deprecated.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> * @param string $cat_name Optional. The category name to use. If no match is found uses all.
</span><span class="cx"> * @param string $before Optional. The html to output before the link.
</span><span class="cx"> * @param string $after Optional. The html to output after the link.
</span><del>- * @param string $between Optional. The html to output between the link/image and it's description. Not used if no image or $show_images is true.
</del><ins>+ * @param string $between Optional. The html to output between the link/image and its description. Not used if no image or $show_images is true.
</ins><span class="cx"> * @param bool $show_images Optional. Whether to show images (if defined).
</span><span class="cx"> * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url', 'description' or 'rating'. Or maybe owner.
</span><span class="cx"> * If you start the name with an underscore the order will be reversed. You can also specify 'rand' as the order which will return links in a
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> * @param string $cat_name The category name to use. If no match is found uses all
</span><span class="cx"> * @param string $before The html to output before the link
</span><span class="cx"> * @param string $after The html to output after the link
</span><del>- * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images is true
</del><ins>+ * @param string $between The html to output between the link/image and its description. Not used if no image or show_images is true
</ins><span class="cx"> * @param bool $show_images Whether to show images (if defined).
</span><span class="cx"> * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url',
</span><span class="cx"> * 'description', or 'rating'. Or maybe owner. If you start the name with an
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> * @param int $category The category to use. If no category supplied uses all
</span><span class="cx"> * @param string $before The html to output before the link
</span><span class="cx"> * @param string $after The html to output after the link
</span><del>- * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images == true
</del><ins>+ * @param string $between The html to output between the link/image and its description. Not used if no image or show_images == true
</ins><span class="cx"> * @param bool $show_images Whether to show images (if defined).
</span><span class="cx"> * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url',
</span><span class="cx"> * 'description', or 'rating'. Or maybe owner. If you start the name with an
</span></span></pre></div>
<a id="trunkwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom-comments.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom-comments.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/feed-atom-comments.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss() ?>" type="<?php bloginfo_rss('html_type'); ?>" />
</span><span class="cx"> <?php else : // This comment is in reply to another comment
</span><span class="cx"> $parent_comment = get_comment($comment->comment_parent);
</span><del>- // The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, its more important that they both use the same system
</del><ins>+ // The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system
</ins><span class="cx"> ?>
</span><span class="cx"> <thr:in-reply-to ref="<?php comment_guid($parent_comment) ?>" href="<?php echo get_comment_link($parent_comment) ?>" type="<?php bloginfo_rss('html_type'); ?>" />
</span><span class="cx"> <?php endif;
</span></span></pre></div>
<a id="trunkwpincludesjscropcroppercss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/crop/cropper.css (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/crop/cropper.css 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/js/crop/cropper.css 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> cursor: crosshair;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
</del><ins>+/* an extra classname is applied for Opera < 9.0 to fix its lack of opacity support */
</ins><span class="cx"> .imgCrop_wrap.opera8 .imgCrop_overlay,
</span><span class="cx"> .imgCrop_wrap.opera8 .imgCrop_clickArea {
</span><span class="cx"> background-color: transparent;
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpdialogsjspopupjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.js (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.js 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.js 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Stores the current editor selection for later restoration. This can be useful since some browsers
</span><del>- * looses it's selection if a control element is selected/focused inside the dialogs.
</del><ins>+ * loses its selection if a control element is selected/focused inside the dialogs.
</ins><span class="cx"> *
</span><span class="cx"> * @method storeSelection
</span><span class="cx"> */
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Restores any stored selection. This can be useful since some browsers
</span><del>- * looses it's selection if a control element is selected/focused inside the dialogs.
</del><ins>+ * loses its selection if a control element is selected/focused inside the dialogs.
</ins><span class="cx"> *
</span><span class="cx"> * @method restoreSelection
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> tinymce.create('tinymce.plugins.wpLink', {
</span><span class="cx"> /**
</span><span class="cx"> * Initializes the plugin, this will be executed after the plugin has been created.
</span><del>- * This call is done before the editor instance has finished it's initialization so use the onInit event
</del><ins>+ * This call is done before the editor instance has finished its initialization so use the onInit event
</ins><span class="cx"> * of the editor instance to intercept that event.
</span><span class="cx"> *
</span><span class="cx"> * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/ms-blogs.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Given a blog's (subdomain or directory) slug, retrieve it's id.
</del><ins>+ * Given a blog's (subdomain or directory) slug, retrieve its id.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/query.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -2079,7 +2079,7 @@
</span><span class="cx"> if ( $q['day'] )
</span><span class="cx"> $where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
</span><span class="cx">
</span><del>- // If we've got a post_type AND its not "any" post_type.
</del><ins>+ // If we've got a post_type AND it's not "any" post_type.
</ins><span class="cx"> if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
</span><span class="cx"> foreach ( (array)$q['post_type'] as $_post_type ) {
</span><span class="cx"> $ptype_obj = get_post_type_object($_post_type);
</span></span></pre></div>
<a id="trunkwpincludesrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rss.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rss.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/rss.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> else {
</span><span class="cx"> // Flow
</span><span class="cx"> // 1. check cache
</span><del>- // 2. if there is a hit, make sure its fresh
</del><ins>+ // 2. if there is a hit, make sure it's fresh
</ins><span class="cx"> // 3. if cached obj fails freshness check, fetch remote
</span><span class="cx"> // 4. if remote fails, return stale object, or error
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (23190 => 23191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-12-20 15:49:55 UTC (rev 23190)
+++ trunk/wp-includes/theme.php 2012-12-20 15:55:32 UTC (rev 23191)
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx"> */
</span><span class="cx"> function preview_theme_ob_filter_callback( $matches ) {
</span><span class="cx"> if ( strpos($matches[4], 'onclick') !== false )
</span><del>- $matches[4] = preg_replace('#onclick=([\'"]).*?(?<!\\\)\\1#i', '', $matches[4]); //Strip out any onclicks from rest of <a>. (?<!\\\) means to ignore the '" if its escaped by \ to prevent breaking mid-attribute.
</del><ins>+ $matches[4] = preg_replace('#onclick=([\'"]).*?(?<!\\\)\\1#i', '', $matches[4]); //Strip out any onclicks from rest of <a>. (?<!\\\) means to ignore the '" if it's escaped by \ to prevent breaking mid-attribute.
</ins><span class="cx"> if (
</span><span class="cx"> ( false !== strpos($matches[3], '/wp-admin/') )
</span><span class="cx"> ||
</span></span></pre>
</div>
</div>
</body>
</html>