Changeset 26903


Ignore:
Timestamp:
Jan 22, 2014, 11:48:06 AM (7 years ago)
Author:
mistic100
Message:

Merged revision(s) 26902 from trunk:
bug 3027: Fatal error on Configuration->Options->Photo size

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.6/include/functions.inc.php

    r26591 r26903  
    551551  else
    552552  {
    553     $date = new DateTime();
    554    
    555553    $t = trim($original, '0123456789');
    556554    if (empty($t)) // from timestamp
    557555    {
    558       $date->setTimestamp($original);
     556      $date = new DateTime('@'.$original);
    559557    }
    560558    else // from unknown date format (assuming something like Y-m-d H:i:s)
     
    573571      if (!isset($ymdhms[5])) $ymdhms[5] = 0;
    574572     
     573      $date = new DateTime();
    575574      $date->setDate($ymdhms[0], $ymdhms[1], $ymdhms[2]);
    576575      $date->setTime($ymdhms[3], $ymdhms[4], $ymdhms[5]);
Note: See TracChangeset for help on using the changeset viewer.