Changeset 6202

Timestamp:

07/27/2012 02:54:30 AM (14 years ago)

Author:

johnjamesjacoby

Message:

XProfile:

• Properly escape xprofile_filter_link_profile_data() output.
• Revert part of r6201.
• For 1.5 branch.
• Props vnd.

File:

• branches/1.5/bp-xprofile/bp-xprofile-filters.php (modified) (2 diffs)

branches/1.5/bp-xprofile/bp-xprofile-filters.php

@@ -155 +155 @@
         $values = explode( ',', $field_value );
 
-        if ( $values ) {
-                foreach ( (array)$values as $value ) {
+        if ( !empty( $values ) ) {
+                foreach ( (array) $values as $value ) {
                         $value = trim( $value );
 
@@ -162 +162 @@
                         if ( preg_match( '@(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)@', $value ) ) {
                                 $new_values[] = make_clickable( $value );
+
+                        // Is not clickable
                         } else {
+
+                                // More than 5 commas
                                 if ( count( explode( ' ', $value ) ) > 5 ) {
-                                        $new_values[] = esc_html( $value );
+                                        $new_values[] = $value;
+
+                                // Less than 5 commas
                                 } else {
-                                        $new_values[] = '<a href="' . site_url( bp_get_members_root_slug() ) . '/?s=' . esc_url( strip_tags( $value ) ) . '" rel="nofollow">' . esc_html( $value ) . '</a>';
+                                        $search_url   = add_query_arg( array( 's' => urlencode( $value ) ), bp_get_members_directory_permalink() );
+                                        $new_values[] = '<a href="' . $search_url . '" rel="nofollow">' . esc_html( $value ) . '</a>';
                                 }
                         }