Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

443
 
758
 
758
 
datetime.php
_> 11 <?php
  22 /*
<> 3 -  $Id: datetime.php 443 2006-02-19 23:01:01Z hpdl $
   3+  $Id: datetime.php 758 2006-08-23 12:30:07Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
1515       return date('Y-m-d H:i:s');     
  1616     }
  1717 
<> 18 -    function getShort($date = '') {
   18+    function getShort($date = null, $with_time = false) {
1919       global $osC_Language;
  2020 
  2121       if (empty($date)) {
     
 !
3030       $second = (int)substr($date, 17, 2);
  3131 
  3232       if (@date('Y', mktime($hour, $minute, $second, $month, $day, $year)) == $year) {
<> 33 -        return strftime($osC_Language->getDateFormatShort(), mktime($hour, $minute, $second, $month, $day, $year));
   33+        return strftime($osC_Language->getDateFormatShort($with_time), mktime($hour, $minute, $second, $month, $day, $year));
3434       } else {
<> 35 -        return ereg_replace('2037', $year, strftime($osC_Language->getDateFormatShort(), mktime($hour, $minute, $second, $month, $day, 2037)));
   35+        return ereg_replace('2037', $year, strftime($osC_Language->getDateFormatShort($with_time), mktime($hour, $minute, $second, $month, $day, 2037)));
<_ 3636       }
  3737     }
  3838