Changeset 37807

Timestamp:

06/21/2016 02:49:37 PM (8 years ago)

Author:

nbachiyski

Message:

Admin: escape URL-encoded permalinks

Merge of [37801] to the 4.4 branch.

File:

• branches/4.4/src/wp-admin/includes/post.php (modified) (4 diffs)

branches/4.4/src/wp-admin/includes/post.php

@@ -1310 +1310 @@
             } else {
                 // Allow non-published (private, future) to be viewed at a pretty permalink.
-                $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, urldecode( $permalink ) );
+                $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name,  );
             }
         }
@@ -1320 +1320 @@
 
         if ( false !== $view_link ) {
-            $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $view_link . "</a>\n";
+            $display_link = urldecode( $view_link );
+            $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . esc_html( $display_link ) . "</a>\n";
         } else {
             $return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
@@ -1344 +1345 @@
         }
 
-        $post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
-        $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
+        $post_name_html = '<span id="editable-post-name">' .  . '</span>';
+        $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html,  ) );
 
         $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
@@ -1351 +1352 @@
         $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
         $return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
-        $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
+        $return .= '<span id="editable-post-name-full">' .  . "</span>\n";
     }