Merge branch 'stable'

This commit is contained in:
following
2013-02-05 23:19:18 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -353,7 +353,7 @@ class rowEditor
// Direct float comparison is deprecated and can result in last-digit errors. // Direct float comparison is deprecated and can result in last-digit errors.
// Floats in OC database are only used for reasonably large numbers like coordinates, // Floats in OC database are only used for reasonably large numbers like coordinates,
// waylengths and time estimates, so using a fixed epsilon threshold is safe: // waylengths and time estimates, so using a fixed epsilon threshold is safe:
$changed = (abs($sFormatedValue - $this->fields[$sField]['value']) >= 1e-13); $changed = (abs($sFormatedValue - $this->fields[$sField]['value']) >= 1e-12);
else else
$changed = ($sFormatedValue != $this->fields[$sField]['value']); $changed = ($sFormatedValue != $this->fields[$sField]['value']);
if ($changed) if ($changed)

View File

@ -353,7 +353,7 @@ class user
{ {
return $this->reUser->getValue('watchmail_nextmail'); return $this->reUser->getValue('watchmail_nextmail');
} }
function setWatchmailNext() function setWatchmailNext($value)
{ {
return $this->reUser->setValue('watchmail_nextmail', $value); return $this->reUser->setValue('watchmail_nextmail', $value);
} }