<!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>[36709] trunk/src: Spelling: Standardize on "front end"/"back end" (noun) and "front-end"/"back-end" (adjective).</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/36709">36709</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/36709","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-25 12:52:33 +0000 (Thu, 25 Feb 2016)</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'>Spelling: Standardize on "front end"/"back end" (noun) and "front-end"/"back-end" (adjective).
Props obrienlabs, thewanderingbrit.
Fixes <a href="https://core.trac.wordpress.org/ticket/34887">#34887</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminajaxphp">trunk/src/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunksrcwpadminadminpostphp">trunk/src/wp-admin/admin-post.php</a></li>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitelogophp">trunk/src/wp-admin/includes/class-wp-site-logo.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjsrevisionsjs">trunk/src/wp-admin/js/revisions.js</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteeninccustomheaderphp">trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvefunctionsphp">trunk/src/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveinccustomheaderphp">trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpincludescachephp">trunk/src/wp-includes/cache.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionswpscriptsphp">trunk/src/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesjscustomizeselectiverefreshjs">trunk/src/wp-includes/js/customize-selective-refresh.js</a></li>
<li><a href="#trunksrcwpincludesjsheartbeatjs">trunk/src/wp-includes/js/heartbeat.js</a></li>
<li><a href="#trunksrcwpincludesjspluploadwppluploadjs">trunk/src/wp-includes/js/plupload/wp-plupload.js</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminajaxphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-ajax.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/admin-ajax.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** Load WordPress Bootstrap */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Allow for cross-domain requests (from the frontend). */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Allow for cross-domain requests (from the front end). */
</ins><span class="cx" style="display: block; padding: 0 10px"> send_origin_headers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Require an action parameter
</span></span></pre></div>
<a id="trunksrcwpadminadminpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-post.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/admin-post.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Allow for cross-domain requests (from the frontend). */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/** Allow for cross-domain requests (from the front end). */
</ins><span class="cx" style="display: block; padding: 0 10px"> send_origin_headers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/includes/admin.php');
</span></span></pre></div>
<a id="trunksrcwpadminadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/admin.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * handled separately.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * when in the administration back-end. The default is 256M, or 256 megabytes of memory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * when in the administration back end. The default is 256M, or 256 megabytes of memory.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitelogophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-logo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-logo.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/includes/class-wp-site-logo.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Hide header text on front-end if necessary.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Hide header text on front end if necessary.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * public 'rating' => float 80
</span><span class="cx" style="display: block; padding: 0 10px"> * public 'num_ratings' => int 1
</span><span class="cx" style="display: block; padding: 0 10px"> * public 'homepage' => string 'http://wordpress.org/themes/magazine-basic'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * public 'description' => string 'A basic magazine style layout with a fully customizable layout through a back-end interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
</ins><span class="cx" style="display: block; padding: 0 10px"> * public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function single_row( $theme ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/includes/update-core.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,7 +1095,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear the cache to prevent an update_option() from saving a stale db_version to the cache
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_flush();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // (Not all cache backends listen to 'flush')
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // (Not all cache back ends listen to 'flush')
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( 'alloptions', 'options' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove working directory
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/js/customize-controls.js 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1557,7 +1557,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Watch for changes to the section state
</span><span class="cx" style="display: block; padding: 0 10px"> inject = function ( sectionId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var parentContainer;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! sectionId ) { // @todo allow a control to be embedded without a section, for instance a control embedded in the frontend
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! sectionId ) { // @todo allow a control to be embedded without a section, for instance a control embedded in the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Wait for the section to be registered
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3039,10 +3039,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Limit the URL to internal, front-end links.
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the frontend and the admin are served from the same domain, load the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If the front end and the admin are served from the same domain, load the
</ins><span class="cx" style="display: block; padding: 0 10px"> // preview over ssl if the Customizer is being loaded over ssl. This avoids
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // insecure content warnings. This is not attempted if the admin and frontend
- // are on different domains to avoid the case where the frontend doesn't have
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // insecure content warnings. This is not attempted if the admin and front end
+ // are on different domains to avoid the case where the front end doesn't have
</ins><span class="cx" style="display: block; padding: 0 10px"> // ssl certs.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.add( 'previewUrl', params.previewUrl ).setter( function( to ) {
</span></span></pre></div>
<a id="trunksrcwpadminjsrevisionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/revisions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/revisions.js 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/js/revisions.js 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> revisions = wp.revisions = { model: {}, view: {}, controller: {} };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link post revisions data served from the back-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Link post revisions data served from the back end.
</ins><span class="cx" style="display: block; padding: 0 10px"> revisions.settings = window._wpRevisionsSettings || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For debugging
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/my-sites.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __('Overview'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.') . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-admin/network/sites.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<li>' . __('Visit to go to the front-end site live.') . '</li></ul>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __('Clicking on bold headings can re-sort this table.') . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * For maximum compatibility with different methods of posting users
</span><span class="cx" style="display: block; padding: 0 10px"> * will designate a featured post tag to associate posts with. Since
</span><span class="cx" style="display: block; padding: 0 10px"> * this tag now has special meaning beyond that of a normal tags, users
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * will have the ability to hide it from the front-end of their site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * will have the ability to hide it from the front end of their site.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Featured_Content {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Hide "featured" tag from the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Hide "featured" tag from the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Has to run on wp_loaded so that the preview filters of the Customizer
</span><span class="cx" style="display: block; padding: 0 10px"> * have a chance to alter the value.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Hide featured tag from displaying when global terms are queried from the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Hide featured tag from displaying when global terms are queried from the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Hooks into the "get_terms" filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function hide_featured_term( $terms, $taxonomies, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This filter is only appropriate on the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This filter is only appropriate on the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Hide featured tag from display when terms associated with a post object
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * are queried from the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * are queried from the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Hooks into the "get_the_terms" filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function hide_the_featured_term( $terms, $id, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This filter is only appropriate on the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This filter is only appropriate on the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteeninccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php 2016-02-25 12:52:33 UTC (rev 36709)
</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"> * Set up the WordPress core custom header arguments and settings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses add_theme_support() to register support for 3.4 and up.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses twentythirteen_header_style() to style front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @uses twentythirteen_header_style() to style front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @uses twentythirteen_admin_header_style() to style wp-admin form.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses twentythirteen_admin_header_image() to add custom markup to wp-admin form.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses register_default_headers() to set up the bundled header images.
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/functions.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-content/themes/twentytwelve/functions.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Enqueue scripts and styles for front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enqueue scripts and styles for front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Twelve 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveinccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php 2016-02-25 12:52:33 UTC (rev 36709)
</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"> * Set up the WordPress core custom header arguments and settings.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses add_theme_support() to register support for 3.4 and up.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses twentytwelve_header_style() to style front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @uses twentytwelve_header_style() to style front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @uses twentytwelve_admin_header_style() to style wp-admin form.
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses twentytwelve_admin_header_image() to add custom markup to wp-admin form.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/cache.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,8 +247,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Reset internal cache keys and structures.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the cache backend uses global blog or site IDs as part of its cache keys,
- * this function instructs the backend to reset those keys and perform any cleanup
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the cache back end uses global blog or site IDs as part of its cache keys,
+ * this function instructs the back end to reset those keys and perform any cleanup
</ins><span class="cx" style="display: block; padding: 0 10px"> * since blog or site IDs have changed since cache init.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This function is deprecated. Use wp_cache_switch_to_blog() instead of this
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,7 +1084,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * that have no corresponding setting created.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a mechanism to "wake up" settings that have been dynamically created
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * on the frontend and have been sent to WordPress in `$_POST['customized']`. When WP
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * on the front end and have been sent to WordPress in `$_POST['customized']`. When WP
</ins><span class="cx" style="display: block; padding: 0 10px"> * loads, the dynamically-created settings then will get created and previewed
</span><span class="cx" style="display: block; padding: 0 10px"> * even though they are not directly created statically with code.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1673,10 +1673,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function customize_pane_settings() {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the frontend and the admin are served from the same domain, load the
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the front end and the admin are served from the same domain, load the
</ins><span class="cx" style="display: block; padding: 0 10px"> * preview over ssl if the Customizer is being loaded over ssl. This avoids
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * insecure content warnings. This is not attempted if the admin and frontend
- * are on different domains to avoid the case where the frontend doesn't have
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * insecure content warnings. This is not attempted if the admin and front end
+ * are on different domains to avoid the case where the front end doesn't have
</ins><span class="cx" style="display: block; padding: 0 10px"> * ssl certs. Domain mapping plugins can allow other urls in these conditions
</span><span class="cx" style="display: block; padding: 0 10px"> * using the customize_allowed_urls filter.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1752,7 +1752,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Pass to frontend the Customizer construct being deeplinked.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Pass to front end the Customizer construct being deeplinked.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->get_autofocus() as $type => $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $can_autofocus = (
</span><span class="cx" style="display: block; padding: 0 10px"> ( 'control' === $type && $this->get_control( $id ) && $this->get_control( $id )->check_capabilities() )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/class-wp.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't allow non-publicly queryable taxonomies to be queried from the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't allow non-publicly queryable taxonomies to be queried from the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></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/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo We should probably re-apply some constraints imposed by $args.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $args['include'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove invalid items only in frontend.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove invalid items only in front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array_filter( $items, '_is_valid_nav_menu_item' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionswpscriptsphp"></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/functions.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-scripts.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/functions.wp-scripts.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $handle, $no ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> "<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, $message, '3.6' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizeselectiverefreshjs"></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/js/customize-selective-refresh.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-selective-refresh.js 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/js/customize-selective-refresh.js 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> settings: [],
</span><span class="cx" style="display: block; padding: 0 10px"> primarySetting: null,
</span><span class="cx" style="display: block; padding: 0 10px"> containerInclusive: false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fallbackRefresh: true // Note this needs to be false in a frontend editing context.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fallbackRefresh: true // Note this needs to be false in a front-end editing context.
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> options.params || {}
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,7 +526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Request full page refresh.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When selective refresh is embedded in the context of frontend editing, this request
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When selective refresh is embedded in the context of front-end editing, this request
</ins><span class="cx" style="display: block; padding: 0 10px"> * must fail or else changes will be lost, unless transactions are implemented.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0
</span></span></pre></div>
<a id="trunksrcwpincludesjsheartbeatjs"></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/js/heartbeat.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/heartbeat.js 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/js/heartbeat.js 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> settings.mainInterval = settings.minimalInterval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 'screenId' can be added from settings on the front-end where the JS global 'pagenow' is not set
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 'screenId' can be added from settings on the front end where the JS global 'pagenow' is not set
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! settings.screenId ) {
</span><span class="cx" style="display: block; padding: 0 10px"> settings.screenId = options.screenId || 'front';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesjspluploadwppluploadjs"></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/js/plupload/wp-plupload.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/plupload/wp-plupload.js 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/js/plupload/wp-plupload.js 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The Plupload library provides cross-browser uploader UI integration.
</span><span class="cx" style="display: block; padding: 0 10px"> * This object bridges the Plupload API to integrate uploads into the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * WordPress back-end and the WordPress media experience.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * WordPress back end and the WordPress media experience.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {object} options The options passed to the new plupload instance.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {object} options.container The id of uploader container.
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/link-template.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2926,7 +2926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieve the URL for the current site where the front-end is accessible.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieve the URL for the current site where the front end is accessible.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns the 'home' option with the appropriate protocol, 'https' if
</span><span class="cx" style="display: block; padding: 0 10px"> * {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2944,7 +2944,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Retrieve the URL for a given site where the front-end is accessible.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieve the URL for a given site where the front end is accessible.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns the 'home' option with the appropriate protocol, 'https' if
</span><span class="cx" style="display: block; padding: 0 10px"> * {@see is_ssl()} and 'http' otherwise. If `$scheme` is 'http' or 'https',
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/nav-menu.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = array_map( 'wp_setup_nav_menu_item', $items );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_admin() ) { // Remove invalid items only in frontend
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_admin() ) { // Remove invalid items only in front end
</ins><span class="cx" style="display: block; padding: 0 10px"> $items = array_filter( $items, '_is_valid_nav_menu_item' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/pluggable.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $secure = is_ssl();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Frontend cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
</ins><span class="cx" style="display: block; padding: 0 10px"> $secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/post.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5037,7 +5037,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_the_guid( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // On SSL front-end, URLs should be HTTPS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // On SSL front end, URLs should be HTTPS.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/taxonomy.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0 Introduced `show_in_quick_edit` argument.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 The `show_ui` argument is now enforced on the term editing screen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.4.0 The `public` argument now controls whether the taxonomy can be queried on the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.4.0 The `public` argument now controls whether the taxonomy can be queried on the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Introduced `publicly_queryable` argument.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_taxonomies Registered taxonomies.
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/user.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,7 +1357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * https. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $user_registered Date the user registered. Format is 'Y-m-d H:i:s'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string|bool $show_admin_bar_front Whether to display the Admin Bar for the user on the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * site's frontend. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * site's front end. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $role User's role.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2016-02-25 10:22:43 UTC (rev 36708)
+++ trunk/src/wp-includes/widgets.php 2016-02-25 12:52:33 UTC (rev 36709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,8 +638,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before widgets are rendered in a dynamic sidebar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Note: The action also fires for empty sidebars, and on both the front-end
- * and back-end, including the Inactive Widgets sidebar on the Widgets screen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: The action also fires for empty sidebars, and on both the front end
+ * and back end, including the Inactive Widgets sidebar on the Widgets screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the parameters passed to a widget's display callback.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Note: The filter is evaluated on both the front-end and back-end,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: The filter is evaluated on both the front end and back end,
</ins><span class="cx" style="display: block; padding: 0 10px"> * including for the Inactive Widgets sidebar on the Widgets screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before a widget's display callback is called.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Note: The action fires on both the front-end and back-end, including
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: The action fires on both the front end and back end, including
</ins><span class="cx" style="display: block; padding: 0 10px"> * for widgets in the Inactive Widgets sidebar on the Widgets screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The action is not fired for empty sidebars.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,13 +722,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $name Name of the widget.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $id Widget ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type array|callable $callback When the hook is fired on the front-end, $callback is an array
- * containing the widget object. Fired on the back-end, $callback
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array|callable $callback When the hook is fired on the front end, $callback is an array
+ * containing the widget object. Fired on the back end, $callback
</ins><span class="cx" style="display: block; padding: 0 10px"> * is 'wp_widget_control', see $_callback.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $params An associative array of multi-widget arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $classname CSS class applied to the widget container.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $description The widget description.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type array $_callback When the hook is fired on the back-end, $_callback is populated
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array $_callback When the hook is fired on the back end, $_callback is populated
</ins><span class="cx" style="display: block; padding: 0 10px"> * with an array containing the widget object, see $callback.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,8 +743,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after widgets are rendered in a dynamic sidebar.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Note: The action also fires for empty sidebars, and on both the front-end
- * and back-end, including the Inactive Widgets sidebar on the Widgets screen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: The action also fires for empty sidebars, and on both the front end
+ * and back end, including the Inactive Widgets sidebar on the Widgets screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,8 +757,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter whether a sidebar has widgets.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Note: The filter is also evaluated for empty sidebars, and on both the front-end
- * and back-end, including the Inactive Widgets sidebar on the Widgets screen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: The filter is also evaluated for empty sidebars, and on both the front end
+ * and back end, including the Inactive Widgets sidebar on the Widgets screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -770,7 +770,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether widget is displayed on the front-end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether widget is displayed on the front end.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Either $callback or $id_base can be used
</span><span class="cx" style="display: block; padding: 0 10px"> * $id_base is the first argument when extending WP_Widget class
</span></span></pre>
</div>
</div>
</body>
</html>