Changeset 38459 for trunk/src/wp-includes/comment.php

Timestamp:

08/31/2016 05:48:49 AM (8 years ago)

Author:

wonderboymusic

Message:

General: use get_bloginfo( 'version' ) instead of global $wp_version in several locations - excluding those locations which reload version.php mid-flight.

See #37699.

File:

• trunk/src/wp-includes/comment.php (modified) (3 diffs)

trunk/src/wp-includes/comment.php

@@ -2363 +2363 @@
  * @since 0.71
  *
- * @global string $wp_version
- *
  * @param string $content Post content to check for links.
  * @param int $post_ID Post ID.
  */
 function pingback($content, $post_ID) {
-    global $wp_version;
-
     // original code by Mort (http://mort.mine.nu:8080)
     $post_links = array();
@@ -2436 +2432 @@
              * @param string $pagelinkedfrom      URL of page linked from.
              */
-            $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
+            $client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . get_bloginfo( 'version' ), $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
             // when set to true, this outputs debug messages by itself
             $client->debug = false;
@@ -2505 +2501 @@
  * @since 1.2.0
  *
- * @global string $wp_version
- *
  * @param string $server Host of blog to connect to.
  * @param string $path Path to send the ping.
  */
 function weblog_ping($server = '', $path = '') {
-    global $wp_version;
-
     // using a timeout of 3 seconds should be enough to cover slow servers
     $client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
     $client->timeout = 3;
-    $client->useragent .= ' -- WordPress/'.$wp_version;
+    $client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
 
     // when set to true, this outputs debug messages by itself