db-prefs: better error output for missing prefs, digest: hide DIGEST_ENABLE pref...

diff --git a/classes/db/prefs.php b/classes/db/prefs.php
index 26fb4666bae468cfa977c73eec81792222d976ab..3e92bb89b59073766e61eadf28dac6af0d3826e8 100644 (file)
--- a/classes/db/prefs.php
+++ b/classes/db/prefs.php
@@ -105,7 +105,7 @@ class Db_Prefs {
                        return $this->convert($value, $type_name);
 
                } else {
-                       user_error("Fatal error, unknown preferences key: $pref_name", $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+                       user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", $die_on_error ? E_USER_ERROR : E_USER_WARNING);
                        return null;
                }
        }

diff --git a/include/digest.php b/include/digest.php
index 965fd1a7935f29d371bcdb7af824338ab211cde9..4427936e58cab7893f1233db08102bba1c1705d5 100644 (file)
--- a/include/digest.php
+++ b/include/digest.php
@@ -26,7 +26,7 @@
 
                while ($line = db_fetch_assoc($result)) {
 
-                       if (get_pref('DIGEST_ENABLE', $line['id'], false)) {
+                       if (@get_pref('DIGEST_ENABLE', $line['id'], false)) {
                                $preferred_ts = strtotime(get_pref('DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
 
                                // try to send digests within 2 hours of preferred time