summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/function.inc6
-rw-r--r--includes/user.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/function.inc b/includes/function.inc
index 90a1179db..dc013683e 100644
--- a/includes/function.inc
+++ b/includes/function.inc
@@ -62,15 +62,15 @@ function format_plural($count, $singular, $plural) {
}
function format_interval($timestamp) {
- if ($timestamp > 86400) {
+ if ($timestamp >= 86400) {
$output .= format_plural(floor($timestamp / 86400), "day ", "days ");
$timestamp = $timestamp % 86400;
}
- if ($timestamp > 3600) {
+ if ($timestamp >= 3600) {
$output .= format_plural(floor($timestamp / 3600), "hour ", "hours ");
$timestamp = $timestamp % 3600;
}
- if ($timestamp > 60) {
+ if ($timestamp >= 60) {
$output .= floor($timestamp / 60) ." min ";
$timestamp = $timestamp % 60;
}
diff --git a/includes/user.inc b/includes/user.inc
index 75bd5cfaf..7d04c785f 100644
--- a/includes/user.inc
+++ b/includes/user.inc
@@ -15,7 +15,7 @@ function user_save($data, $id = 0) {
foreach ($data as $key=>$value) {
if ($key == "passwd") $query .= "$key = PASSWORD('". addslashes($value) ."'), ";
- else $query .= "$key='". addslashes($value) ."', ";
+ else $query .= "$key = '". addslashes($value) ."', ";
}
if (empty($id)) {