Changeset 30957


Ignore:
Timestamp:
02/13/15 09:34:20 (4 years ago)
Author:
mistic100
Message:

Merged revision(s) 30956 from trunk:
bug 3188: history search, trailing space in dates

Location:
branches/2.7/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.7/admin/history.php

    r30949 r30957  
    7676  if (!empty($_POST['start'])) 
    7777  { 
    78     $_POST['start'] = trim($_POST['start']); 
    7978    check_input_parameter('start', $_POST, false, '/^\d{4}-\d{2}-\d{2}$/'); 
    8079    $search['fields']['date-after'] = $_POST['start']; 
     
    8382  if (!empty($_POST['end'])) 
    8483  { 
    85     $_POST['end'] = trim($_POST['end']); 
    8684    check_input_parameter('end', $_POST, false, '/^\d{4}-\d{2}-\d{2}$/'); 
    8785    $search['fields']['date-before'] = $_POST['end']; 
  • branches/2.7/admin/themes/default/js/datepicker.js

    r30632 r30957  
    108108      dateFormat: linked ? 'DD d MM yy' : 'yy-mm-dd', 
    109109      timeFormat: 'HH:mm', 
     110      separator: options.showTimepicker ? ' ' : '', 
    110111 
    111112      altField: linked ? $target : null, 
Note: See TracChangeset for help on using the changeset viewer.