Skip to content
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

check for empty searches #66

Merged
merged 5 commits into from
Oct 30, 2014
Merged

check for empty searches #66

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4e2e60
check for empty searches
nhart Oct 14, 2014
80b66e9
check for empty searches
nhart Oct 14, 2014
b36aa67
pr fix
nhart Oct 23, 2014
120763e
merge conflick
nhart Oct 23, 2014
0038297
pr fix
nhart Oct 23, 2014
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
2 changes: 1 addition & 1 deletion includes/highlighting.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* An array as per islandora_paged_content_parse_solr_highlighting().
*/
function islandora_paged_content_perform_solr_highlighting_query($query, $params = array()) {
if (!module_exists('islandora_ocr')) {
if (!$query || $query == ' ' || !module_exists('islandora_ocr')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we change $query == ' ' to be empty(trim($query))? I think it would be safer.

return array();
}
module_load_include('inc', 'islandora_ocr', 'includes/solr');
Expand Down