Skip to content

Issue #51: Fix TypeError with trim() and validate manual, too #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
indigoxela merged 1 commit into from
Mar 11, 2026
Merged

Issue #51: Fix TypeError with trim() and validate manual, too #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions geofield.elements.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,28 @@ function geofield_proximity_element_process($element, &$form_state, $form) {
* Validate the geofield proximity search form item
*/
function geofield_proximity_search_validate($element, &$form_state) {
//If the origin is set, ensure the distance is set as well
if (!empty($element['origin']['#value']) && trim($element['origin']['#value']) != '' && empty($element['distance']['#value']))
form_set_error(implode('][', $element['#array_parents']) . '][distance', t('@title must be set when @origin is specified.', array('@title' => $element['distance']['#title'], '@origin' => $element['origin']['#title'])));
// If the origin is set, ensure the distance is set as well.
$origin_empty = TRUE;
// String based like geocoder.
if (isset($element['origin']['#value']) && is_string($element['origin']['#value'])) {
$element['origin']['#value'] = trim($element['origin']['#value']);
$origin_empty = ($element['origin']['#value'] == '');
}
// Array based like manual input.
elseif (is_array($element['origin']['#default_value'])) {
foreach ($element['origin']['#default_value'] as $key => $default) {
if (isset($element['origin'][$key]) && strlen($element['origin'][$key]['#value'])) {
$origin_empty = FALSE;
break;
}
}
}
if (!$origin_empty && empty($element['distance']['#value'])) {
form_set_error(implode('][', $element['#array_parents']) . '][distance', t('@title must be set when @origin is specified.', array(
'@title' => $element['distance']['#title'],
'@origin' => $element['origin']['#title'],
)));
}
}

function geofield_theme($existing, $type, $theme, $path) {
Expand Down
Loading