Merge branch '2.2.x' into devel

2012-11-20 11:21:29 -05:00 · 2012-11-20 11:21:29 -05:00 · fed39077c0
commit fed39077c0
parent c1959f936e 9c612d17a3
9 changed files with 199 additions and 175 deletions
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@ -1116,7 +1116,6 @@ class Application_Model_Preference
            } else {
                /*For now we just have this hack for debugging. We should not
                    rely on this crappy behaviour in case of failure*/
-                Logging::info("Pref: $pref_param");
                Logging::warn("Index $x does not exist preferences");
                Logging::warn("Defaulting to identity and printing preferences");
                Logging::warn($ds);