Ticket #6346: 6346.hex.patch

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

@@ -1661 +1661 @@
                                                                                 ? $r['action']
                                                                                 : bp_activity_generate_action_string( $activity );
 
-        if ( ! $activity->save() ) {
+        $success = $activity->save();
+
+        // If the save failed, see if we can sanity check the main fields and try again
+        if ( ! $success && is_callable( array( $GLOBALS['wpdb'], 'strip_invalid_text_for_column' ) ) ) {
+                $fields = array( 'content' );
+
+                foreach( $fields as $field ) {
+                        if ( isset( $activity->$field ) ) {
+                                $activity->$field = $GLOBALS['wpdb']->strip_invalid_text_for_column( buddypress()->activity->table_name, $field, $activity->$field );
+                        }
+                }
+
+                $success = $activity->save();
+        }
+
+        if ( ! $success ) {
                 return false;
         }
 

tests/phpunit/testcases/activity/functions.php

@@ -5 +5 @@
 class BP_Tests_Activity_Functions extends BP_UnitTestCase {
 
         /**
+         * @ticket BP6346
+         */
+        public function test_bp_activity_add_and_hex_a_to_f_characters() {
+                $a = $this->factory->activity->create( array(
+                        'type' => 'activity_update',
+
+                        // you can switch out %E9 with any A-F prefixed character.
+                        // http://www.ascii.cl/htmlcodes.htm
+                        'content' => urldecode( 'hey hey %E9' )
+                ) );
+
+                $this->assertNotFalse( $a, 'bp_activity_add() failed to insert content with hex A-F characters.' );
+        }
+
+        /**
          * @ticket BP4488
          */
         public function test_thumbnail_content_images() {