Commit c7f1552e authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1709731: 'Use content from another note' Search error"

parents 8075324e 2ff8a83b
......@@ -201,7 +201,7 @@ jQuery(function($) {
var queryData = [];
if (loc != -1) {
queryData = {
extraData: JSON.stringify(p.extraData),
extradata: JSON.stringify(p.extraData),
search: $('#artefactchooser-searchfield').val()
}
}
......
......@@ -3166,17 +3166,7 @@ class View {
return array($result, $pagination, 0, 0, array());
}
$search = '';
if (!empty($data['search']) && param_boolean('s')) {
$search = param_variable('search', '');
// Maybe later, depending on performance - don't search if there's
// not enough characters. Prompts should be added to the UI too.
//if (strlen($search) < 3) {
// $search = '';
//}
}
$data['search'] = $search;
$data['search'] = param_variable('search', '');
$data['offset'] -= $data['offset'] % $data['limit'];
safe_require('blocktype', $data['blocktype']);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment