Skip to content

Commit 5d65f7e

Browse files
committed
smaller fixes
1 parent 424dc35 commit 5d65f7e

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

src/wcmf/application/views/plugins/function.daterange.php

+13
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@
2626
* @return String
2727
*/
2828
function smarty_function_daterange(array $params, Smarty_Internal_Template $template) {
29+
$hasFrom = strlen($params['from']) > 0;
30+
$hasTo = strlen($params['to']) > 0;
31+
if (!$hasFrom && !$hasTo) {
32+
return '';
33+
}
34+
35+
if ($hasFrom && !$hasTo) {
36+
$params['to'] = $params['from'];
37+
}
38+
elseif (!$hasFrom && $hasTo) {
39+
$params['from'] = $params['to'];
40+
}
41+
2942
$from = new DateTime($params['from']);
3043
$to = new DateTime($params['to']);
3144
$lang = $params['lang'];

src/wcmf/lib/search/impl/LuceneSearch.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ public function find($searchTerm, PagingInfo $pagingInfo=null, $createSummary=tr
181181
}
182182
}
183183
}
184-
$results[$oidStr] = [
184+
}
185+
$results[$oidStr] = [
185186
'oid' => $oidStr,
186187
'score' => $hit->score,
187188
'summary' => $summary
188-
];
189-
}
189+
];
190190
}
191191
}
192192
catch (Exception $ex) {

0 commit comments

Comments
 (0)