summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2012-01-25 08:19:32 -0500
committerDries2012-01-25 08:19:32 -0500
commitf5abeb9b11fe2c407b811ab388360add6466488f (patch)
treecb04eb9fcfb11842470fb89134cd7fd1b2bb5cd3
parentd78f6a63d4514bfdc0558f2e912fd92cdb9cc3e9 (diff)
- Patch #1416218 by scorchio: Improve variable naming in format_interval().
-rw-r--r--core/includes/common.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 67a4457..e2c8784 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -1806,7 +1806,7 @@ function format_size($size, $langcode = NULL) {
/**
* Formats a time interval with the requested granularity.
*
- * @param $timestamp
+ * @param $interval
* The length of the interval in seconds.
* @param $granularity
* How many different units to display in the string.
@@ -1817,7 +1817,7 @@ function format_size($size, $langcode = NULL) {
* @return
* A translated string representation of the interval.
*/
-function format_interval($timestamp, $granularity = 2, $langcode = NULL) {
+function format_interval($interval, $granularity = 2, $langcode = NULL) {
$units = array(
'1 year|@count years' => 31536000,
'1 month|@count months' => 2592000,
@@ -1830,9 +1830,9 @@ function format_interval($timestamp, $granularity = 2, $langcode = NULL) {
$output = '';
foreach ($units as $key => $value) {
$key = explode('|', $key);
- if ($timestamp >= $value) {
- $output .= ($output ? ' ' : '') . format_plural(floor($timestamp / $value), $key[0], $key[1], array(), array('langcode' => $langcode));
- $timestamp %= $value;
+ if ($interval >= $value) {
+ $output .= ($output ? ' ' : '') . format_plural(floor($interval / $value), $key[0], $key[1], array(), array('langcode' => $langcode));
+ $interval %= $value;
$granularity--;
}