aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2015-02-13 08:34:20 +0000
committermistic100 <mistic@piwigo.org>2015-02-13 08:34:20 +0000
commitf5979a419e3d328ca5a5d6ee4c56feb5dab143cf (patch)
treee173ff7f30b2435de23148d46c1938a5b39d7499 /admin
parentcd74b8548f0f9217102db1eec9cb6ca5616f6fd5 (diff)
Merged revision(s) 30956 from trunk:
bug 3188: history search, trailing space in dates git-svn-id: http://piwigo.org/svn/branches/2.7@30957 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/history.php2
-rw-r--r--admin/themes/default/js/datepicker.js1
2 files changed, 1 insertions, 2 deletions
diff --git a/admin/history.php b/admin/history.php
index 190ad334b..26855bb40 100644
--- a/admin/history.php
+++ b/admin/history.php
@@ -75,14 +75,12 @@ if (isset($_POST['submit']))
// dates
if (!empty($_POST['start']))
{
- $_POST['start'] = trim($_POST['start']);
check_input_parameter('start', $_POST, false, '/^\d{4}-\d{2}-\d{2}$/');
$search['fields']['date-after'] = $_POST['start'];
}
if (!empty($_POST['end']))
{
- $_POST['end'] = trim($_POST['end']);
check_input_parameter('end', $_POST, false, '/^\d{4}-\d{2}-\d{2}$/');
$search['fields']['date-before'] = $_POST['end'];
}
diff --git a/admin/themes/default/js/datepicker.js b/admin/themes/default/js/datepicker.js
index 2c72f823f..cabf1f479 100644
--- a/admin/themes/default/js/datepicker.js
+++ b/admin/themes/default/js/datepicker.js
@@ -107,6 +107,7 @@ jQuery.fn.pwgDatepicker = function(settings) {
$this.datetimepicker(jQuery.extend({
dateFormat: linked ? 'DD d MM yy' : 'yy-mm-dd',
timeFormat: 'HH:mm',
+ separator: options.showTimepicker ? ' ' : '',
altField: linked ? $target : null,
altFormat: 'yy-mm-dd',