Changeset 2656

Timestamp:

05/07/08 11:59:30 (3 months ago)

Author:

Shadowhand

Message:

Follow up to r2655, it's a good thing to have working methods.

Files:

• trunk/system/helpers/date.php (modified) (2 diffs)

trunk/system/helpers/date.php

@@ -355 +355 @@
-        }
-
+        /**
+         * Returns time difference between two timestamps, in the format:
+         * N year, N months, N weeks, N days, N hours, N minutes, and N seconds ago
+         *
+         * @param   integer       timestamp
+         * @param   integer       timestamp, defaults to the current time
+         * @param   string        formatting string
+         * @return  string
+         */
-        public static function timespan_string($time1, $time2 = NULL, $output = 'years,months,weeks,days,hours,minutes,seconds')
-        {
-                if ($difference = date::timespan($time1, $time2, $output) AND is_array($difference))
-                {
-
-
-
-
+
+
+
-
-                        $span = array();
-                        foreach ($difference as $name => $amount)
-                        {
-
+
+
+
+
+
+
-                                {
-                                        // Make the name singualr
@@ -373 +386 @@
-                                }
-
+                                if ($name === $last)
+                                {
+                                        // Add "and"
+                                        $amount = 'and '.$amount;
+                                }
+
+                                // Add the amount to the span
-                                $span[] = $amount.' '.$name;
-                        }
-
-span = array_splice()
-
-
-}
+difference = implode(', ', $span).' ago';
+
+
+return $difference;
-        }
-