Changeset 9456

Timestamp:

02/09/2015 09:35:35 AM (10 years ago)

Author:

djpaul

Message:

Activity: update bp_activity_thumbnail_content_images to check that height/width attributes exist on <img> tags before trying to reference them.

Prevents PHP Notices in edge cases involving developers putting custom content through this function.

Fixes #6159

File:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-functions.php

@@ -2619 +2619 @@
         preg_match( '/<img.*?(width\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i',  $matches[0][0], $width  );
 
-        if ( !empty( $src ) ) {
-            $src    = substr( substr( str_replace( 'src=',    '', $src[1]    ), 0, -1 ), 1 );
-            $height = substr( substr( str_replace( 'height=', '', $height[1] ), 0, -1 ), 1 );
-            $width  = substr( substr( str_replace( 'width=',  '', $width[1]  ), 0, -1 ), 1 );
+        if ( ! empty( $src ) ) {
+            $src = substr( substr( str_replace( 'src=', '', $src[1] ), 0, -1 ), 1 );
+
+            if ( isset( $width[1] ) ) {
+                $width = substr( substr( str_replace( 'width=', '', $width[1] ), 0, -1 ), 1 );
+            }
+
+            if ( isset( $height[1] ) ) {
+                $height = substr( substr( str_replace( 'height=', '', $height[1] ), 0, -1 ), 1 );
+            }
 
             if ( empty( $width ) || empty( $height ) ) {