<!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>[38459] trunk/src: General: use `get_bloginfo( 'version' )` instead of `global $wp_version` in several locations - excluding those locations which reload `version.php` mid-flight.</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/38459">38459</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/38459","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-31 05:48:49 +0000 (Wed, 31 Aug 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'>General: use `get_bloginfo( 'version' )` instead of `global $wp_version` in several locations - excluding those locations which reload `version.php` mid-flight.
See <a href="https://core.trac.wordpress.org/ticket/37699">#37699</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminaboutphp">trunk/src/wp-admin/about.php</a></li>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadmincreditsphp">trunk/src/wp-admin/credits.php</a></li>
<li><a href="#trunksrcwpadminfreedomsphp">trunk/src/wp-admin/freedoms.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppressthisphp">trunk/src/wp-admin/includes/class-wp-press-this.php</a></li>
<li><a href="#trunksrcwpadminincludescreditsphp">trunk/src/wp-admin/includes/credits.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswplocalephp">trunk/src/wp-includes/class-wp-locale.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminaboutphp"></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/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/about.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/about.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'About' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-list( $display_version ) = explode( '-', $wp_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminadminheaderphp"></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-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-header.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/admin-header.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,12 +18,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Screen $current_screen
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Locale $wp_locale
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $pagenow
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> * @global string $update_title
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $total_update_count
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $parent_file
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
</ins><span class="cx" style="display: block; padding: 0 10px"> $update_title, $total_update_count, $parent_file;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Catch plugins that include admin-header.php before admin.php completes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,8 +153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current_screen->taxonomy )
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' taxonomy-' . $current_screen->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">-$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
-$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
+$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmincreditsphp"></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/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/credits.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/credits.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Credits' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-list( $display_version ) = explode( '-', $wp_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminfreedomsphp"></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/freedoms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/freedoms.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/freedoms.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Freedoms' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-list( $display_version ) = explode( '-', $wp_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpautomaticupdaterphp"></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-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,13 +371,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @global wpdb $wpdb
- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function run() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_disabled() )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,7 +452,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send debugging email to all development installs.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->update_results ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $development_version = false !== strpos( $wp_version, '-' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to send a debugging email for each automatic background update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,12 +489,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Unknown
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param object $update_result The result of the core update. Includes the update offer and result.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function after_core_update( $update_result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $core_update = $update_result->item;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $update_result->result;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,8 +577,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $type The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $core_update The update offer that was attempted.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $result Optional. The result for the core update. Can be WP_Error.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'critical' == $type && is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n***\n\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body .= sprintf( __( 'Your site was running version %s.' ), $GLOBALS['wp_version'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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-plugin-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-plugin-install-list-table.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $paged
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $type
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $term
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'search' === $tab ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['search'] = __( 'Search Results' );
</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 ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['featured'] = _x( 'Featured', 'Plugin Installer' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,9 +390,6 @@
</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">- /**
- * @global string $wp_version
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function display_rows() {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_allowedtags = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,9 +570,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="column-compatibility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
+
+ if ( ! empty( $plugin['tested'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppressthisphp"></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-press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-press-this.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,8 +267,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Source's HTML sanitized markup
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function fetch_source_html( $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $url ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_url = wp_safe_remote_get( $url, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 30,
</span><span class="cx" style="display: block; padding: 0 10px"> // Use an explicit user-agent for Press This
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'Press This (WordPress/' . get_bloginfo( 'version' ) . '); ' . get_bloginfo( 'url' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $remote_url ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,12 +1187,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Locale $wp_locale
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_IE
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_locale, $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_locale;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get data, new (POST) and old (GET).
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $this->merge_or_fetch_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludescreditsphp"></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/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/credits.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/includes/credits.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,14 +10,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieve the contributor credits.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version The current WordPress version.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false A list of all of the contributors, or false on error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_credits() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = get_site_transient( 'wordpress_credits_' . $locale );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> || false !== strpos( $wp_version, '-' )
</span><span class="cx" style="display: block; padding: 0 10px"> || ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/includes/dashboard.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1393,8 +1393,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool False on failure, array of browser data on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_browser_version() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1404,11 +1402,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'WordPress/' . get_bloginfo( 'version' ) . '; ' . home_url()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/includes/plugin-install.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +423,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $tab
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_plugin_information() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $tab;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,9 +629,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="section-holder" class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
+
+ if ( ! empty( $api->tested ) && version_compare( substr( $wp_version, 0, strlen( $api->tested ) ), $api->tested, '>' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.' ) . '</p></div>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $api->requires ) && version_compare( substr( $wp_version, 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.' ) . '</p></div>';
</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="trunksrcwpadminplugineditorphp"></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/plugin-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-editor.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/plugin-editor.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( !empty( $docs_select ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" /></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&redirect=true'); }" /></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_writeable($real_file) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></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/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/theme-editor.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="documentation" class="hide-if-no-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="docs-list"><?php _e('Documentation:') ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $docs_select; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&redirect=true'); }" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-admin/update-core.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,16 +26,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_local_package
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @staticvar bool $first_pass
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $update
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function list_core_update( $update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_local_package, $wpdb, $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_local_package, $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> static $first_pass = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
</span><span class="cx" style="display: block; padding: 0 10px"> $version_string = $update->current;
</span><span class="cx" style="display: block; padding: 0 10px"> // If the only available update is a partial builds, it doesn't need a language-specific version string.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,13 +150,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_php_version
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_mysql_version
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function core_upgrade_preamble() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version, $required_php_version, $required_mysql_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $required_php_version, $required_mysql_version;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $updates = get_core_updates();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,15 +212,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> dismissed_updates();
</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">-/**
- *
- * @global string $wp_version
- */
</del><span class="cx" style="display: block; padding: 0 10px"> function list_plugin_updates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
+ $cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cur_wp_version = preg_replace('/-.*$/', '', $wp_version);
-
</del><span class="cx" style="display: block; padding: 0 10px"> require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = get_plugin_updates();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $plugins ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/class-http.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,8 +101,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The request URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Array or string of HTTP request arguments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $httpversion Version of the HTTP protocol to use. Accepts '1.0' and '1.1'.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default '1.0'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $user-agent User-agent value sent.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $reject_unsafe_urls Whether to pass URLs through wp_http_validate_url().
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $blocking Whether the calling code requires the result of the request.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,8 +146,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A WP_Error instance upon error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function request( $url, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'method' => 'GET',
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_agent WordPress user agent string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to pass URLs through wp_http_validate_url() in an HTTP request.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/class-wp-editor.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,14 +296,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @static
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> * @global string $tinymce_version
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $editor_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $set
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function editor_settings($editor_id, $set) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version, $tinymce_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $tinymce_version;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty(self::$first_init) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +558,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"> $suffix = SCRIPT_DEBUG ? '' : '.min';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $version = 'ver=' . $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $version = 'ver=' . get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // WordPress default stylesheet and dashicons
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,13 +1130,12 @@
</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"> * @static
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> * @global string $tinymce_version
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $concatenate_scripts
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $compress_scripts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function editor_js() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version, $tinymce_version, $concatenate_scripts, $compress_scripts;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $tinymce_version, $concatenate_scripts, $compress_scripts;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters "tiny_mce_version" is deprecated
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1215,7 +1213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $baseurl = self::$baseurl;
</span><span class="cx" style="display: block; padding: 0 10px"> // Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mce_suffix = false !== strpos( $wp_version, '-src' ) ? '' : '.min';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tmce_on ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $compressed ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplocalephp"></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-locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/class-wp-locale.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $text_direction
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function init() {
</span><span class="cx" style="display: block; padding: 0 10px"> // The Weekdays
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> elseif ( 'rtl' == _x( 'ltr', 'text direction' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->text_direction = 'rtl';
</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 ( 'rtl' === $this->text_direction && strpos( $GLOBALS['wp_version'], '-src' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'rtl' === $this->text_direction && strpos( get_bloginfo( 'version' ), '-src' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->text_direction = 'ltr';
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'all_admin_notices', array( $this, 'rtl_src_admin_notice' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,12 +413,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Passes property through {@see 'xmlrpc_blog_options'} filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function initialise_blog_option_info() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->blog_options = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Read only options
</span><span class="cx" style="display: block; padding: 0 10px"> 'software_name' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'software_version' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'desc' => __( 'Software Version' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'readonly' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => $wp_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => get_bloginfo( 'version' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_url' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'desc' => __( 'WordPress Address (URL)' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6186,8 +6182,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Method arguments. Note: arguments must be ordered as documented.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6197,8 +6191,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function pingback_ping( $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'pingback.ping' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6285,7 +6277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class-http.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_agent = apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's check the remote site
</span><span class="cx" style="display: block; padding: 0 10px"> $http_api_args = array(
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/comment.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2362,14 +2362,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Post content to check for links.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_ID Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function pingback($content, $post_ID) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // original code by Mort (http://mort.mine.nu:8080)
</span><span class="cx" style="display: block; padding: 0 10px"> $post_links = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2435,7 +2431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $pagelinkedto URL of page linked to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $pagelinkedfrom URL of page linked from.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . get_bloginfo( 'version' ), $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
</ins><span class="cx" style="display: block; padding: 0 10px"> // when set to true, this outputs debug messages by itself
</span><span class="cx" style="display: block; padding: 0 10px"> $client->debug = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2504,18 +2500,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $server Host of blog to connect to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Path to send the ping.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function weblog_ping($server = '', $path = '') {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> // using a timeout of 3 seconds should be enough to cover slow servers
</span><span class="cx" style="display: block; padding: 0 10px"> $client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
</span><span class="cx" style="display: block; padding: 0 10px"> $client->timeout = 3;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $client->useragent .= ' -- WordPress/'.$wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // when set to true, this outputs debug messages by itself
</span><span class="cx" style="display: block; padding: 0 10px"> $client->debug = false;
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/formatting.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4927,12 +4927,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @global string $wp_version WordPress version string.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _print_emoji_detection_script() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the URL where emoji png images are hosted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4971,7 +4967,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'svgExt' => apply_filters( 'emoji_svg_ext', '.svg' ),
</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">- $version = 'ver=' . $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $version = 'ver=' . get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( SCRIPT_DEBUG ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['source'] = array(
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/general-template.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3344,8 +3344,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers the default Admin color schemes
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * @global string $wp_version
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_admin_color_schemes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = is_rtl() ? '-rtl' : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3358,8 +3356,9 @@
</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"> // Other color schemes are not available when running out of src
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( get_bloginfo( 'version' ), '-src' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( "css/colors/light/colors$suffix.css" ),
</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-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/link-template.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2897,17 +2897,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global bool $is_IE Whether the browser matches an Internet Explorer user agent.
- * @global string $wp_version WP version.
- *
- * @global bool $is_IE
- * @global string $wp_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global bool $is_IE Whether the browser matches an Internet Explorer user agent.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Press_This $wp_press_this
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The Press This bookmarklet link URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_shortcut_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $is_IE, $wp_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $is_IE;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_press_this'] = new WP_Press_This();
</span><span class="cx" style="display: block; padding: 0 10px"> $bookmarklet_version = $GLOBALS['wp_press_this']->version;
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2016-08-31 05:03:37 UTC (rev 38458)
+++ trunk/src/wp-includes/media.php 2016-08-31 05:48:49 UTC (rev 38459)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3810,12 +3810,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array The relevant CSS file URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wpview_media_sandbox_styles() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $version = 'ver=' . $GLOBALS['wp_version'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $version = 'ver=' . get_bloginfo( 'version' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>