Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2012-04-18 16:14:04 -04:00 · 2012-04-18 16:14:04 -04:00 · 7de74f2540
parent 79f3473dfe 58f4727f17
commit 7de74f2540
1 changed files with 2 additions and 1 deletions
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@ -154,7 +154,8 @@ class Application_Model_Preference
        $fade = self::GetValue("default_fade");
        
        if ($fade === "") {
-            return null;
+            // the default value of the fade is 00.500000
+            return "00.500000";
        } 
        
        $fade = number_format($fade, 6);