Changeset 5736 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

Timestamp:

08/03/2017 07:35:20 AM (7 years ago)

Author:

tellyworth

Message:

Plugin directory: prevent very short translations from interfering with shortcodes. Props @SergeyBiryukov.

Fixes #2919

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -407 +407 @@
      */
     public function translate_gp_original( $original, $translation, $content ) {
+        $original = preg_quote( $original, '/' );
+
         if ( false === strpos( $content, '<' ) ) {
-            $content = str_replace( $original, $translation, $content );
+            // Don't use $translation, it may contain backreference-like characters.
+            $content = preg_replace( "/\b{$original}\b/", '___TRANSLATION___', $content );
         } else {
-            $original = preg_quote( $original, '/' );
-            $content  = preg_replace( "/(<([a-z0-9]*)\b[^>]*>){$original}(<\/\\2>)/m", '${1}___TRANSLATION___${3}', $content ); // Don't use $translation, it may contain backreference-like characters.
-            $content  = str_replace( '___TRANSLATION___', $translation, $content );
-        }
+            // Don't use $translation, it may contain backreference-like characters.
+            $content = preg_replace( "/(<([a-z0-9]*)\b[^>]*>){$original}(<\/\\2>)/m", '${1}___TRANSLATION___${3}', $content );
+        }
+
+        $content = str_replace( '___TRANSLATION___', $translation, $content );
 
         return $content;