Changeset 42917

Timestamp:

04/03/2018 04:04:26 PM (8 years ago)

Author:

ocean90

Message:

Template: Make sure the version string is correctly escaped for use in attributes.

Merge of [42893] to the 4.9 branch.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/general-template.php (modified) (1 diff)

branches/4.9/src/wp-includes/general-template.php

@@ -4115 +4115 @@
         switch ( $type ) {
                 case 'html':
-                        $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
+                        $gen = '<meta name="generator" content="WordPress ' . esc_attr( get_bloginfo( 'version' ) ) . '">';
                         break;
                 case 'xhtml':
-                        $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />';
+                        $gen = '<meta name="generator" content="WordPress ' . esc_attr( get_bloginfo( 'version' ) ) . '" />';
                         break;
                 case 'atom':
-                        $gen = '<generator uri="https://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
+                        $gen = '<generator uri="https://wordpress.org/" version="' . esc_attr( get_bloginfo_rss( 'version' ) ) . '">WordPress</generator>';
                         break;
                 case 'rss2':
-                        $gen = '<generator>https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '</generator>';
+                        $gen = '<generator>' . esc_url_raw( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '</generator>';
                         break;
                 case 'rdf':
-                        $gen = '<admin:generatorAgent rdf:resource="https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '" />';
+                        $gen = '<admin:generatorAgent rdf:resource="' . esc_url_raw( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '" />';
                         break;
                 case 'comment':
-                        $gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
+                        $gen = '<!-- generator="WordPress/' . esc_attr( get_bloginfo( 'version' ) ) . '" -->';
                         break;
                 case 'export':
-                        $gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
+                        $gen = '<!-- generator="WordPress/' . esc_attr( get_bloginfo_rss( 'version' ) ) . '" created="' . date( 'Y-m-d H:i' ) . '" -->';
                         break;
         }