Merge branch '2.2.x' into devel

This commit is contained in:
denise 2012-11-21 10:54:17 -05:00
commit f88a7bdb31
4 changed files with 17 additions and 7 deletions

View file

@ -206,7 +206,7 @@ class Application_Model_Preference
$fade = number_format($fade, 2);
//fades need 2 leading zeros for DateTime conversion
$fade = rtrim(str_pad($fade, 5, "0", STR_PAD_LEFT), "0");
$fade = str_pad($fade, 5, "0", STR_PAD_LEFT);
return $fade;
}