Changeset 9523

Timestamp:

02/22/2015 01:07:08 AM (11 years ago)

Author:

boonebgorges

Message:

In bp_create_excerpt(), recognize HTML comments when exclude HTML from counts.

This prevents problems with, among other things, the <!--more--> tag in
activity streams.

Fixes #3680.

Location:

trunk

Files:

• src/bp-core/bp-core-template.php (modified) (1 diff)
• tests/phpunit/testcases/core/template (added)
• tests/phpunit/testcases/core/template/bpCreateExcerpt.php (added)

trunk/src/bp-core/bp-core-template.php

@@ -659 +659 @@
                 $truncate    = '';
 
-                // Find all the tags and put them in a stack for later use
-                preg_match_all( '/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER );
+                // Find all the tags and HTML comments and put them in a stack for later use
+                preg_match_all( '/(<\/?([\w!].+?)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER );
+
                 foreach ( $tags as $tag ) {
-
                         // Process tags that need to be closed
                         if ( !preg_match( '/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s',  $tag[2] ) ) {