Changeset 10565

Timestamp:

01/11/2021 02:34:51 AM (6 years ago)

Author:

dd32

Message:

Plugin Driectory: Readme: When trimming the short_description to length, decode HTML entities first to limit it to displayed length rather than computed length.

This also ensures that the … is only applied after a shortened string, and restores the functionality to limit it to a full setence if one ends between characters 120-150.

See #5570.

File:

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

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

@@ -470 +470 @@
          */
         protected function trim_length( $desc, $length = 150 ) {
-                if ( mb_strlen( $desc ) > $length ) {
-                        $desc = mb_substr( $desc, 0, $length ) . ' …';
-
-                        // If not a full sentence, and one ends within 20% of the end, trim it to that.
-                        if ( '.' !== mb_substr( $desc, -1 ) && ( $pos = mb_strrpos( $desc, '.' ) ) > ( 0.8 * $length ) ) {
-                                $desc = mb_substr( $desc, 0, $pos + 1 );
+                // Apply the length restriction without counting html entities.
+                $str_length = mb_strlen( html_entity_decode( $desc ) ?: $desc );
+
+                if ( $str_length > $length ) {
+                        $desc = mb_substr( $desc, 0, $length );
+
+                        // If not a full sentence...
+                        if ( '.' !== mb_substr( $desc, -1 ) ) {
+                                // ..and one ends within 20% of the end, trim it to that.
+                                if ( ( $pos = mb_strrpos( $desc, '.' ) ) > ( 0.8 * $length ) ) {
+                                        $desc = mb_substr( $desc, 0, $pos + 1 );
+                                } else {
+                                        // ..else mark it as being trimmed.
+                                        $desc .= ' …';
+                                }
                         }
                 }