Changeset 11287

Timestamp:

12/11/2016 04:16:02 PM (8 years ago)

Author:

djpaul

Message:

xprofile: add support for auto linking semicolon-separated field values.

Fixes #5872

Props jreeve, tw2113

Location:

trunk

Files:

• src/bp-xprofile/bp-xprofile-filters.php (modified) (2 diffs)
• tests/phpunit/testcases/xprofile/functions.php (modified) (1 diff)

trunk/src/bp-xprofile/bp-xprofile-filters.php

@@ -350 +350 @@
     }
 
-    if ( !strpos( $field_value, ',' ) && ( count( explode( ' ', $field_value ) ) > 5 ) ) {
+    if ( strpos( $field_value, ',' ) === false && strpos( $field_value, ';' ) === false && ( count( explode( ' ', $field_value ) ) > 5 ) ) {
         return $field_value;
     }
 
-    $values = explode( ',', $field_value );
-
-    if ( !empty( $values ) ) {
+    if ( strpos( $field_value, ',' ) !== false ) {
+        $list_type = 'comma';
+        $values    = explode( ',', $field_value ); // Comma-separated lists.
+    } else {
+        $list_type = 'semicolon';
+        $values = explode( ';', $field_value ); // Semicolon-separated lists.
+    }
+
+    if ( ! empty( $values ) ) {
         foreach ( (array) $values as $value ) {
             $value = trim( $value );
@@ -380 +386 @@
         }
 
-        $values = implode( ', ', $new_values );
+        if ( 'comma' === $list_type ) {
+            $values = implode( ', ', $new_values );
+        } else {
+            $values = implode( '; ', $new_values );
+        }
     }
 

trunk/tests/phpunit/testcases/xprofile/functions.php

@@ -1043 +1043 @@
         $profile_template = $reset_profile_template;
     }
+
+    /**
+     * @group xprofile_filter_link_profile_data
+     */
+    public function test_field_comma_seperated_values_are_autolinked() {
+        $field_group_id = $this->factory->xprofile_group->create();
+        $field_id = $this->factory->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
+        $GLOBALS['field'] = new BP_XProfile_Field( $this->field_id );
+        $GLOBALS['field']->do_autolink = true;
+
+        $output = xprofile_filter_link_profile_data( 'Hello world this is a test; with, some, words', 'textbox' );
+        $regex = '#^Hello world this is a test; with, <a href="([^"]+)" rel="nofollow">some</a>, <a href="([^"]+)" rel="nofollow">words</a>$#i';
+
+        $this->assertRegExp( $regex, $output );
+        unset( $GLOBALS['field'] );
+    }
+
+    /**
+     * @group xprofile_filter_link_profile_data
+     */
+    public function test_field_semicolon_seperated_values_are_autolinked() {
+        $field_group_id = $this->factory->xprofile_group->create();
+        $field_id = $this->factory->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
+        $GLOBALS['field'] = new BP_XProfile_Field( $this->field_id );
+        $GLOBALS['field']->do_autolink = true;
+
+        $output = xprofile_filter_link_profile_data( 'Hello world this is a test with; some; words', 'textbox' );
+        $regex = '#^Hello world this is a test with; <a href="([^"]+)" rel="nofollow">some</a>; <a href="([^"]+)" rel="nofollow">words</a>$#i';
+
+        $this->assertRegExp( $regex, $output );
+        unset( $GLOBALS['field'] );
+    }
 }