summaryrefslogtreecommitdiff
path: root/includes/function.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/function.inc')
-rw-r--r--includes/function.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/includes/function.inc b/includes/function.inc
index de5de07e6..0308a5efc 100644
--- a/includes/function.inc
+++ b/includes/function.inc
@@ -36,19 +36,19 @@ function format_plural($count, $singular, $plural) {
function format_interval($timestamp) {
if ($timestamp >= 86400) {
- $output .= format_plural(floor($timestamp / 86400), "day ", "days ");
+ $output .= format_plural(floor($timestamp / 86400), "day", "days");
$timestamp = $timestamp % 86400;
}
if ($timestamp >= 3600) {
- $output .= format_plural(floor($timestamp / 3600), "hour ", "hours ");
+ $output .= " ". format_plural(floor($timestamp / 3600), "hour", "hours");
$timestamp = $timestamp % 3600;
}
if ($timestamp >= 60) {
- $output .= floor($timestamp / 60) ." min ";
+ $output .= " ". floor($timestamp / 60) ."min";
$timestamp = $timestamp % 60;
}
if ($timestamp > 0) {
- $output .= "$timestamp sec";
+ $output .= " $timestamp sec";
}
return ($output) ? $output : "0 sec";
}
@@ -74,7 +74,6 @@ function format_date($timestamp, $type = "medium") {
return $date;
}
-
function format_username($username) {
global $user;
if ($username) return (user_access($user, "account") ? "<A HREF=\"admin.php?mod=account&op=view&name=$username\">$username</A>" : "<A HREF=\"account.php?op=view&name=$username\">$username</A>");