Index: src/bp-templates/bp-legacy/css/twentyfifteen-rtl.css =================================================================== --- src/bp-templates/bp-legacy/css/twentyfifteen-rtl.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentyfifteen-rtl.css (working copy) @@ -625,14 +625,12 @@ padding: 10px; } -#buddypress #activity-stream .load-more:focus, -#buddypress #activity-stream .load-more:hover { +#buddypress #activity-stream .load-more:focus, #buddypress #activity-stream .load-more:hover { background: #f4f4f4; border: 1px solid rgba(159, 209, 226, 0.3); } -#buddypress #activity-stream .load-more:focus a, -#buddypress #activity-stream .load-more:hover a { +#buddypress #activity-stream .load-more:focus a, #buddypress #activity-stream .load-more:hover a { font-style: italic; } @@ -774,8 +772,7 @@ text-align: center; } -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1515,7 +1512,7 @@ } .bp-user #buddypress #message-threads tr td.thread-info a::after { - content: " –  " attr(title); + content: " – " attr(title); font-size: 12px; font-size: 1.2rem; } @@ -1720,8 +1717,7 @@ #buddypress div.dir-search, #buddypress div.message-search, -#buddypress -li.groups-members-search { +#buddypress li.groups-members-search { float: none; margin: 10px 0; } @@ -1728,8 +1724,7 @@ #buddypress div.dir-search form, #buddypress div.message-search form, -#buddypress -li.groups-members-search form { +#buddypress li.groups-members-search form { border: 1px solid rgba(153, 153, 153, 0.4); overflow: hidden; } @@ -1736,8 +1731,7 @@ #buddypress div.dir-search form label, #buddypress div.message-search form label, -#buddypress -li.groups-members-search form label { +#buddypress li.groups-members-search form label { float: right; width: 80%; } @@ -1744,8 +1738,7 @@ #buddypress div.dir-search form input[type='text'], #buddypress div.message-search form input[type='text'], -#buddypress -li.groups-members-search form input[type='text'] { +#buddypress li.groups-members-search form input[type='text'] { float: right; margin: 0; width: 80%; @@ -1755,10 +1748,8 @@ #buddypress div.dir-search form input[type='submit'], #buddypress div.message-search form input[type='text'], #buddypress div.message-search form input[type='submit'], -#buddypress -li.groups-members-search form input[type='text'], -#buddypress -li.groups-members-search form input[type='submit'] { +#buddypress li.groups-members-search form input[type='text'], +#buddypress li.groups-members-search form input[type='submit'] { font-size: 14px; font-size: 1.4rem; border: 0; @@ -1767,8 +1758,7 @@ #buddypress div.dir-search form input[type='text'], #buddypress div.message-search form input[type='text'], -#buddypress -li.groups-members-search form input[type='text'] { +#buddypress li.groups-members-search form input[type='text'] { border-left: 1px solid rgba(153, 153, 153, 0.4); padding: 0.2em 0.2em 0.2em 0; } @@ -1775,8 +1765,7 @@ #buddypress div.dir-search form input[type='submit'], #buddypress div.message-search form input[type='submit'], -#buddypress -li.groups-members-search form input[type='submit'] { +#buddypress li.groups-members-search form input[type='submit'] { float: left; font-weight: normal; padding: 0.2em 1em; Index: src/bp-templates/bp-legacy/css/twentyfifteen.css =================================================================== --- src/bp-templates/bp-legacy/css/twentyfifteen.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentyfifteen.css (working copy) @@ -625,14 +625,12 @@ padding: 10px; } -#buddypress #activity-stream .load-more:focus, -#buddypress #activity-stream .load-more:hover { +#buddypress #activity-stream .load-more:focus, #buddypress #activity-stream .load-more:hover { background: #f4f4f4; border: 1px solid rgba(159, 209, 226, 0.3); } -#buddypress #activity-stream .load-more:focus a, -#buddypress #activity-stream .load-more:hover a { +#buddypress #activity-stream .load-more:focus a, #buddypress #activity-stream .load-more:hover a { font-style: italic; } @@ -774,8 +772,7 @@ text-align: center; } -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1515,7 +1512,7 @@ } .bp-user #buddypress #message-threads tr td.thread-info a::after { - content: " –  " attr(title); + content: " – " attr(title); font-size: 12px; font-size: 1.2rem; } @@ -1720,8 +1717,7 @@ #buddypress div.dir-search, #buddypress div.message-search, -#buddypress -li.groups-members-search { +#buddypress li.groups-members-search { float: none; margin: 10px 0; } @@ -1728,8 +1724,7 @@ #buddypress div.dir-search form, #buddypress div.message-search form, -#buddypress -li.groups-members-search form { +#buddypress li.groups-members-search form { border: 1px solid rgba(153, 153, 153, 0.4); overflow: hidden; } @@ -1736,8 +1731,7 @@ #buddypress div.dir-search form label, #buddypress div.message-search form label, -#buddypress -li.groups-members-search form label { +#buddypress li.groups-members-search form label { float: left; width: 80%; } @@ -1744,8 +1738,7 @@ #buddypress div.dir-search form input[type='text'], #buddypress div.message-search form input[type='text'], -#buddypress -li.groups-members-search form input[type='text'] { +#buddypress li.groups-members-search form input[type='text'] { float: left; margin: 0; width: 80%; @@ -1755,10 +1748,8 @@ #buddypress div.dir-search form input[type='submit'], #buddypress div.message-search form input[type='text'], #buddypress div.message-search form input[type='submit'], -#buddypress -li.groups-members-search form input[type='text'], -#buddypress -li.groups-members-search form input[type='submit'] { +#buddypress li.groups-members-search form input[type='text'], +#buddypress li.groups-members-search form input[type='submit'] { font-size: 14px; font-size: 1.4rem; border: 0; @@ -1767,8 +1758,7 @@ #buddypress div.dir-search form input[type='text'], #buddypress div.message-search form input[type='text'], -#buddypress -li.groups-members-search form input[type='text'] { +#buddypress li.groups-members-search form input[type='text'] { border-right: 1px solid rgba(153, 153, 153, 0.4); padding: 0.2em 0 0.2em 0.2em; } @@ -1775,8 +1765,7 @@ #buddypress div.dir-search form input[type='submit'], #buddypress div.message-search form input[type='submit'], -#buddypress -li.groups-members-search form input[type='submit'] { +#buddypress li.groups-members-search form input[type='submit'] { float: right; font-weight: normal; padding: 0.2em 1em; Index: src/bp-templates/bp-legacy/css/twentyfourteen-rtl.css =================================================================== --- src/bp-templates/bp-legacy/css/twentyfourteen-rtl.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentyfourteen-rtl.css (working copy) @@ -211,8 +211,7 @@ float: none; overflow: hidden; } - #buddypress #object-nav ul li:focus, - #buddypress #object-nav ul li:hover { + #buddypress #object-nav ul li:focus, #buddypress #object-nav ul li:hover { background: #bebebe; } #buddypress #object-nav ul li span { @@ -241,8 +240,7 @@ #buddypress #item-body #subnav li.current { background: #f1f1f1; } - #buddypress #item-body #subnav li#activity-filter-select:focus, - #buddypress #item-body #subnav li#activity-filter-select:hover { + #buddypress #item-body #subnav li#activity-filter-select:focus, #buddypress #item-body #subnav li#activity-filter-select:hover { background: none; } #buddypress #item-body #subnav li#activity-filter-select select { @@ -603,8 +601,7 @@ text-align: center; } -#buddypress .activity .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress .activity .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress .activity .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress .activity .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1127,7 +1124,7 @@ } #buddypress table#message-threads tr td.thread-info a::after { - content: " –  " attr(title); + content: " – " attr(title); font-size: 12px; font-size: 0.75rem; } Index: src/bp-templates/bp-legacy/css/twentyfourteen.css =================================================================== --- src/bp-templates/bp-legacy/css/twentyfourteen.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentyfourteen.css (working copy) @@ -211,8 +211,7 @@ float: none; overflow: hidden; } - #buddypress #object-nav ul li:focus, - #buddypress #object-nav ul li:hover { + #buddypress #object-nav ul li:focus, #buddypress #object-nav ul li:hover { background: #bebebe; } #buddypress #object-nav ul li span { @@ -241,8 +240,7 @@ #buddypress #item-body #subnav li.current { background: #f1f1f1; } - #buddypress #item-body #subnav li#activity-filter-select:focus, - #buddypress #item-body #subnav li#activity-filter-select:hover { + #buddypress #item-body #subnav li#activity-filter-select:focus, #buddypress #item-body #subnav li#activity-filter-select:hover { background: none; } #buddypress #item-body #subnav li#activity-filter-select select { @@ -603,8 +601,7 @@ text-align: center; } -#buddypress .activity .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress .activity .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress .activity .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress .activity .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1127,7 +1124,7 @@ } #buddypress table#message-threads tr td.thread-info a::after { - content: " –  " attr(title); + content: " – " attr(title); font-size: 12px; font-size: 0.75rem; } Index: src/bp-templates/bp-legacy/css/twentysixteen-rtl.css =================================================================== --- src/bp-templates/bp-legacy/css/twentysixteen-rtl.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentysixteen-rtl.css (working copy) @@ -171,12 +171,10 @@ display: inline; opacity: 0.7; } - .bp-user #buddypress #object-nav:hover:before, - .bp-user #buddypress #object-nav:focus:before { + .bp-user #buddypress #object-nav:hover:before, .bp-user #buddypress #object-nav:focus:before { content: "Menu \021E7"; } - .bp-user #buddypress #object-nav:hover ul, - .bp-user #buddypress #object-nav:focus ul { + .bp-user #buddypress #object-nav:hover ul, .bp-user #buddypress #object-nav:focus ul { height: 320px; opacity: 1; overflow-y: auto; @@ -207,8 +205,7 @@ } @media screen and (max-width: 38.75em) { - #buddypress #object-nav ul li:not(.selected):focus, - #buddypress #object-nav ul li:not(.selected):hover { + #buddypress #object-nav ul li:not(.selected):focus, #buddypress #object-nav ul li:not(.selected):hover { background: #f4f2df; } } @@ -354,8 +351,7 @@ min-height: 0; } -#buddypress div.pagination:before, -#buddypress div.pagination:after { +#buddypress div.pagination:before, #buddypress div.pagination:after { height: 0; width: 0; } @@ -408,14 +404,12 @@ font-family: "Source Sans Pro", Helvetica, sans-serif; } -#buddypress .activity-meta .button:focus, -#buddypress .activity-meta .button:hover { +#buddypress .activity-meta .button:focus, #buddypress .activity-meta .button:hover { background: inherit; color: #000; } -#buddypress .action .generic-button a:focus, -#buddypress .action .generic-button a:hover { +#buddypress .action .generic-button a:focus, #buddypress .action .generic-button a:hover { background: inherit; color: #000; } @@ -726,14 +720,12 @@ padding: 10px; } -#buddypress #activity-stream .load-more:focus, -#buddypress #activity-stream .load-more:hover { +#buddypress #activity-stream .load-more:focus, #buddypress #activity-stream .load-more:hover { background: #f4f4f4; border: 1px solid rgba(159, 209, 226, 0.3); } -#buddypress #activity-stream .load-more:focus a, -#buddypress #activity-stream .load-more:hover a { +#buddypress #activity-stream .load-more:focus a, #buddypress #activity-stream .load-more:hover a { font-style: italic; } @@ -797,8 +789,7 @@ text-align: center; } -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1463,7 +1454,7 @@ } .bp-user #buddypress #message-threads tr td.thread-info a::after { - content: " ‖  " attr(title); + content: " ‖ " attr(title); font-size: 12px; font-size: 0.75rem; } Index: src/bp-templates/bp-legacy/css/twentysixteen.css =================================================================== --- src/bp-templates/bp-legacy/css/twentysixteen.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentysixteen.css (working copy) @@ -171,12 +171,10 @@ display: inline; opacity: 0.7; } - .bp-user #buddypress #object-nav:hover:before, - .bp-user #buddypress #object-nav:focus:before { + .bp-user #buddypress #object-nav:hover:before, .bp-user #buddypress #object-nav:focus:before { content: "Menu \021E7"; } - .bp-user #buddypress #object-nav:hover ul, - .bp-user #buddypress #object-nav:focus ul { + .bp-user #buddypress #object-nav:hover ul, .bp-user #buddypress #object-nav:focus ul { height: 320px; opacity: 1; overflow-y: auto; @@ -207,8 +205,7 @@ } @media screen and (max-width: 38.75em) { - #buddypress #object-nav ul li:not(.selected):focus, - #buddypress #object-nav ul li:not(.selected):hover { + #buddypress #object-nav ul li:not(.selected):focus, #buddypress #object-nav ul li:not(.selected):hover { background: #f4f2df; } } @@ -354,8 +351,7 @@ min-height: 0; } -#buddypress div.pagination:before, -#buddypress div.pagination:after { +#buddypress div.pagination:before, #buddypress div.pagination:after { height: 0; width: 0; } @@ -408,14 +404,12 @@ font-family: "Source Sans Pro", Helvetica, sans-serif; } -#buddypress .activity-meta .button:focus, -#buddypress .activity-meta .button:hover { +#buddypress .activity-meta .button:focus, #buddypress .activity-meta .button:hover { background: inherit; color: #000; } -#buddypress .action .generic-button a:focus, -#buddypress .action .generic-button a:hover { +#buddypress .action .generic-button a:focus, #buddypress .action .generic-button a:hover { background: inherit; color: #000; } @@ -726,14 +720,12 @@ padding: 10px; } -#buddypress #activity-stream .load-more:focus, -#buddypress #activity-stream .load-more:hover { +#buddypress #activity-stream .load-more:focus, #buddypress #activity-stream .load-more:hover { background: #f4f4f4; border: 1px solid rgba(159, 209, 226, 0.3); } -#buddypress #activity-stream .load-more:focus a, -#buddypress #activity-stream .load-more:hover a { +#buddypress #activity-stream .load-more:focus a, #buddypress #activity-stream .load-more:hover a { font-style: italic; } @@ -797,8 +789,7 @@ text-align: center; } -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1463,7 +1454,7 @@ } .bp-user #buddypress #message-threads tr td.thread-info a::after { - content: " ‖  " attr(title); + content: " ‖ " attr(title); font-size: 12px; font-size: 0.75rem; } Index: src/bp-templates/bp-legacy/css/twentythirteen-rtl.css =================================================================== --- src/bp-templates/bp-legacy/css/twentythirteen-rtl.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentythirteen-rtl.css (working copy) @@ -124,12 +124,10 @@ display: inline; opacity: 0.7; } - .bp-user #buddypress #object-nav:hover:before, - .bp-user #buddypress #object-nav:focus:before { + .bp-user #buddypress #object-nav:hover:before, .bp-user #buddypress #object-nav:focus:before { content: "Menu \021E7"; } - .bp-user #buddypress #object-nav:hover ul, - .bp-user #buddypress #object-nav:focus ul { + .bp-user #buddypress #object-nav:hover ul, .bp-user #buddypress #object-nav:focus ul { height: 320px; opacity: 1; overflow-y: auto; @@ -150,8 +148,7 @@ } @media screen and (max-width: 38.75em) { - #buddypress #object-nav ul li:focus, - #buddypress #object-nav ul li:hover { + #buddypress #object-nav ul li:focus, #buddypress #object-nav ul li:hover { background: #f4f2df; } } @@ -360,14 +357,12 @@ font-family: "Source Sans Pro", Helvetica, sans-serif; } -#buddypress .activity-meta .button:focus, -#buddypress .activity-meta .button:hover { +#buddypress .activity-meta .button:focus, #buddypress .activity-meta .button:hover { background: #e37a5a; color: #f7f5e7; } -#buddypress .action .generic-button a:focus, -#buddypress .action .generic-button a:hover { +#buddypress .action .generic-button a:focus, #buddypress .action .generic-button a:hover { background: #e37a5a; color: #f7f5e7; } @@ -678,14 +673,12 @@ padding: 10px; } -#buddypress #activity-stream .load-more:focus, -#buddypress #activity-stream .load-more:hover { +#buddypress #activity-stream .load-more:focus, #buddypress #activity-stream .load-more:hover { background: #f4f4f4; border: 1px solid rgba(159, 209, 226, 0.3); } -#buddypress #activity-stream .load-more:focus a, -#buddypress #activity-stream .load-more:hover a { +#buddypress #activity-stream .load-more:focus a, #buddypress #activity-stream .load-more:hover a { font-style: italic; } @@ -749,8 +742,7 @@ text-align: center; } -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1540,7 +1532,7 @@ } .bp-user #buddypress #message-threads tr td.thread-info a::after { - content: " –  " attr(title); + content: " – " attr(title); font-size: 12px; font-size: 0.75rem; } Index: src/bp-templates/bp-legacy/css/twentythirteen.css =================================================================== --- src/bp-templates/bp-legacy/css/twentythirteen.css (revision 10310) +++ src/bp-templates/bp-legacy/css/twentythirteen.css (working copy) @@ -124,12 +124,10 @@ display: inline; opacity: 0.7; } - .bp-user #buddypress #object-nav:hover:before, - .bp-user #buddypress #object-nav:focus:before { + .bp-user #buddypress #object-nav:hover:before, .bp-user #buddypress #object-nav:focus:before { content: "Menu \021E7"; } - .bp-user #buddypress #object-nav:hover ul, - .bp-user #buddypress #object-nav:focus ul { + .bp-user #buddypress #object-nav:hover ul, .bp-user #buddypress #object-nav:focus ul { height: 320px; opacity: 1; overflow-y: auto; @@ -150,8 +148,7 @@ } @media screen and (max-width: 38.75em) { - #buddypress #object-nav ul li:focus, - #buddypress #object-nav ul li:hover { + #buddypress #object-nav ul li:focus, #buddypress #object-nav ul li:hover { background: #f4f2df; } } @@ -360,14 +357,12 @@ font-family: "Source Sans Pro", Helvetica, sans-serif; } -#buddypress .activity-meta .button:focus, -#buddypress .activity-meta .button:hover { +#buddypress .activity-meta .button:focus, #buddypress .activity-meta .button:hover { background: #e37a5a; color: #f7f5e7; } -#buddypress .action .generic-button a:focus, -#buddypress .action .generic-button a:hover { +#buddypress .action .generic-button a:focus, #buddypress .action .generic-button a:hover { background: #e37a5a; color: #f7f5e7; } @@ -678,14 +673,12 @@ padding: 10px; } -#buddypress #activity-stream .load-more:focus, -#buddypress #activity-stream .load-more:hover { +#buddypress #activity-stream .load-more:focus, #buddypress #activity-stream .load-more:hover { background: #f4f4f4; border: 1px solid rgba(159, 209, 226, 0.3); } -#buddypress #activity-stream .load-more:focus a, -#buddypress #activity-stream .load-more:hover a { +#buddypress #activity-stream .load-more:focus a, #buddypress #activity-stream .load-more:hover a { font-style: italic; } @@ -749,8 +742,7 @@ text-align: center; } -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, -#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { +#buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:focus, #buddypress #activity-stream .activity-comments .ac-form .ac-reply-cancel:hover { background: #ededed; } @@ -1540,7 +1532,7 @@ } .bp-user #buddypress #message-threads tr td.thread-info a::after { - content: " –  " attr(title); + content: " – " attr(title); font-size: 12px; font-size: 0.75rem; } Index: src/bp-xprofile/admin/js/admin.js =================================================================== --- src/bp-xprofile/admin/js/admin.js (revision 10310) +++ src/bp-xprofile/admin/js/admin.js (working copy) @@ -82,6 +82,9 @@ if ( XProfileAdmin.supports_options_field_types.indexOf( forWhat ) >= 0 ) { document.getElementById( forWhat ).style.display = ''; + document.getElementById( 'is-searchable' ).checked = true; + } else { + document.getElementById( 'is-searchable' ).checked = false; } } Index: src/bp-xprofile/bp-xprofile-admin.php =================================================================== --- src/bp-xprofile/bp-xprofile-admin.php (revision 10310) +++ src/bp-xprofile/bp-xprofile-admin.php (working copy) @@ -395,6 +395,17 @@ $field->set_member_types( $member_types ); } + // Validate searchable field + if( 1 !== $field_id ) { + $is_searchable = '0'; + + if ( isset($_POST['is-searchable']) && in_array( $_POST['is-searchable'], array( '0', '1' ) ) ) { + $is_searchable = $_POST['is-searchable']; + } + + bp_xprofile_update_field_meta( $field_id, 'is_searchable', $is_searchable ); + } + // Validate default visibility. if ( ! empty( $_POST['default-visibility'] ) && in_array( $_POST['default-visibility'], wp_list_pluck( bp_xprofile_get_visibility_levels(), 'id' ) ) ) { bp_xprofile_update_field_meta( $field_id, 'default_visibility', $_POST['default-visibility'] ); Index: src/bp-xprofile/bp-xprofile-filters.php =================================================================== --- src/bp-xprofile/bp-xprofile-filters.php (revision 10310) +++ src/bp-xprofile/bp-xprofile-filters.php (working copy) @@ -339,6 +339,7 @@ * @return string */ function xprofile_filter_link_profile_data( $field_value, $field_type = 'textbox' ) { + global $field; if ( 'datebox' === $field_type ) { return $field_value; @@ -348,6 +349,10 @@ return $field_value; } + if(!(int)$field->is_searchable && $field->id != 1){ + return $field_value; + } + $values = explode( ',', $field_value ); if ( !empty( $values ) ) { Index: src/bp-xprofile/classes/class-bp-xprofile-field.php =================================================================== --- src/bp-xprofile/classes/class-bp-xprofile-field.php (revision 10310) +++ src/bp-xprofile/classes/class-bp-xprofile-field.php (working copy) @@ -120,6 +120,15 @@ public $is_default_option; /** + * @since BuddyPress Patch (1.0.0) + * + * @author Lenlay + * + * @var bool Is field searchable or not? + */ + public $is_searchable; + + /** * Field data visibility. * * @since 1.9.0 @@ -292,6 +301,10 @@ case 'allow_custom_visibility' : return $this->get_allow_custom_visibility(); break; + + case 'is_searchable' : + return $this->get_searchable(); + break; } } @@ -308,6 +321,7 @@ // Backward compatibility for when these were public methods. case 'allow_custom_visibility' : case 'default_visibility' : + case 'is_searchable' : return true; break; } @@ -784,6 +798,28 @@ } /** + * Get the field's searchable setting. + * + * Lazy-loaded to reduce overhead. + * + * Defaults to '1' if no visibility setting is found in the database. + * + * @since BuddyPress Patch (1.0.0) + * + * @return string + */ + public function get_searchable() { + if ( ! isset( $this->is_searchable ) ) { + $this->is_searchable = bp_xprofile_get_meta( $this->id, 'field', 'is_searchable' ); + if ( ! $this->is_searchable && $this->is_searchable !== '0' ) { + $this->is_searchable = '1'; + } + } + + return $this->is_searchable; + } + + /** * Get whether the field's default visibility can be overridden by users. * * Lazy-loaded to reduce overhead. @@ -1297,6 +1333,25 @@ } /** + * Output the field for setting if field is searchable or not + * + * @since BuddyPress Patch (1.0.0) + * + * @author Lenlay + * + */ + private function searchable_field() { + ?> +

+ get_searchable(), '1'); ?>> + +

+

+ + render_admin_form_children(); ?> + $this->render_admin_form_children(); + // Output the searchable field + $this->searchable_field(); ?> + Index: src/bp-xprofile/classes/class-bp-xprofile-group.php =================================================================== --- src/bp-xprofile/classes/class-bp-xprofile-group.php (revision 10310) +++ src/bp-xprofile/classes/class-bp-xprofile-group.php (working copy) @@ -462,6 +462,9 @@ bp_xprofile_update_meta_cache( $object_ids ); } + // Fetch searchable fields. + $fields = self::fetch_searchable_fields( $fields ); + // Maybe fetch visibility levels. if ( ! empty( $r['fetch_visibility_level'] ) ) { $fields = self::fetch_visibility_level( $r['user_id'], $fields ); @@ -658,6 +661,31 @@ } /** + * Fetch the field searchable value for the fields returned by the query. + * + * @since BuddyPress Patch (1.0.0) + * + * @param array $fields The database results returned by the get() query. + * + * @return array $fields The database results, with field_visibility added + */ + public static function fetch_searchable_fields( $fields = array() ) { + + foreach( (array) $fields as $key => $field ) { + + // Does the admin allow this field to be customized? + $is_searchable = bp_xprofile_get_meta( $field->id, 'field', 'is_searchable'); + + if(!$is_searchable && $is_searchable !== '0') { + $is_searchable = '1'; + } + + $fields[ $key ]->is_searchable = $is_searchable; + } + return $fields; + } + + /** * Fetch the admin-set preferences for all fields. * * @since 1.6.0