From 85a23905e331fa343f84c2713f11b9cb4dfe49e8 Mon Sep 17 00:00:00 2001
From: Dries <dries@buytaert.net>
Date: Wed, 25 Jan 2012 08:19:45 -0500
Subject: - Patch #1416218 by scorchio: Improve variable naming in
 format_interval().

---
 includes/common.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 3e79239f5..b07bf9669 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1817,7 +1817,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.
@@ -1828,7 +1828,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,
@@ -1841,9 +1841,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--;
     }
 
-- 
cgit v1.2.3