Changeset 4175

Timestamp:

10/01/2016 04:01:55 PM (8 years ago)

Author:

jmdodd

Message:

Support Forums: Replace spaces with underscores in Codex link shortcut.

Codex link shortcuts were incorrectly stripping spaces from the link and title rather than replacing them with an underscore.

Props SergeyBiryukov.
Fixes #2103.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-codexify/wporg-bbp-codexify.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-codexify/wporg-bbp-codexify.php

@@ -36 +36 @@
 
     function convert_wiki_links( $content ) {
-        if ( strpos( $content, '[[' ) && strpos( $content, ']]' ) ) {
+        if ( strpos( $content, '[[' ) !== false && strpos( $content, ']]' ) !== false ) {
             $content = preg_replace_callback( '%\[\[([ #:\/\w]+)\]\]%', array( $this, 'convert_base_wiki_link' ), $content );
             $content = preg_replace_callback( '%\[\[([ #:\/\w]+)\|([^\]]+)\]\]%', array( $this, 'convert_vbar_wiki_link' ), $content );
@@ -50 +50 @@
      */
     public static function convert_base_wiki_link( $matches ) {
-        $matches[1] = preg_replace( '/[\s]+/', '', trim( $matches[1] ) );
-        return '<a href="' . esc_url( self::BASE_URI . strtr( $matches[1], ' ', '_' ) ) . '">' . esc_html( $matches[1] ) . '</a>';
+        $path = preg_replace( '/[\s]+/', '_', trim( $matches[1] ) );
+        return '<a href="' . esc_url( self::BASE_URI . $path ) . '">' . esc_html( $matches[1] ) . '</a>';
     }
 
@@ -62 +62 @@
      */
     public static function convert_vbar_wiki_link( $matches ) {
-        $matches[1] = preg_replace( '/[\s]+/', '_', trim( $matches[1] ) );
-        return '<a href="' . esc_url( self::BASE_URI . strtr( $matches[1], ' ', '_' ) ) . '">' . esc_html( $matches[2] ) . '</a>';
+        $path = preg_replace( '/[\s]+/', '_', trim( $matches[1] ) );
+        return '<a href="' . esc_url( self::BASE_URI . $path ) . '">' . esc_html( $matches[2] ) . '</a>';
     }
 } }