Changeset 1040 for trunk

Timestamp:

Feb 13, 2006, 11:15:56 PM (18 years ago)

Author:

plg

Message:

merge -r1038:1039 from branches/branch-1_5 into trunk (bug 269 fixed)

improvement: use a cache on get_icon function since it's often used with the
same argument on a page generation.

File:

• trunk/include/functions_html.inc.php (modified) (2 diffs)

trunk/include/functions_html.inc.php

@@ -26 +26 @@
 // +-----------------------------------------------------------------------+
 
-function get_icon( $date )
-{
-  global $user, $conf, $lang;
-
-  if (!preg_match('/\d{4}-\d{2}-\d{2}/', $date))
-  {
-    return '';
-  }
-
-  list( $year,$month,$day ) = explode( '-', $date );
+function get_icon($date)
+{
+  global $page, $user, $conf, $lang;
+
+  if (empty($date))
+  {
+    $date = 'NULL';
+  }
+
+  if (isset($page['get_icon_cache'][$date]))
+  {
+    return $page['get_icon_cache'][$date];
+  }
+
+  if (!preg_match('/^(\d{4})-(\d{2})-(\d{2})/', $date, $matches))
+  {
+    // date can be empty, no icon to display
+    $page['get_icon_cache'][$date] = '';
+    return $page['get_icon_cache'][$date];
+  }
+  
+  list($devnull, $year, $month, $day) = $matches;
   $unixtime = mktime( 0, 0, 0, $month, $day, $year );
+
+  if ($unixtime === false  // PHP 5.1.0 and above
+      or $unixtime === -1) // PHP prior to 5.1.0
+  {
+    $page['get_icon_cache'][$date] = '';
+    return $page['get_icon_cache'][$date];
+  }
   
   $diff = time() - $unixtime;
@@ -51 +70 @@
     $output.= 'height:'.$size[1].'px;width:'.$size[0].'px" alt="(!)" />';
   }
-  return $output;
+
+  $page['get_icon_cache'][$date] = $output;
+
+  return $page['get_icon_cache'][$date];
 }