X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdb_prefs.php;h=ec2a099f7d1274c7f5932162cd05a8ae16c8a160;hb=32aa007421fc0e1b8620d091a804d61d15c74ba6;hp=12b26d94a8f19cbad0c5f395f44d855006dab738;hpb=17fca61d112f76a3f9c69be39eb1e8c252c95965;p=squirrelmail.git
diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 12b26d94..ec2a099f 100644
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -3,7 +3,7 @@
/**
* db_prefs.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
@@ -41,7 +41,8 @@ if (!include_once('DB.php')) {
// same error also in abook_database.php
require_once(SM_PATH . 'functions/display_messages.php');
$error = _("Could not include PEAR database functions required for the database backend.") . "
\n";
- $error .= _("Is PEAR installed, and is the include path set correctly to find DB.php?") . "
\n";
+ $error .= sprintf(_("Is PEAR installed, and is the include path set correctly to find %s?"),
+ 'DB.php') . "
\n";
$error .= _("Please contact your system administrator and report this error.");
error_box($error, $color);
exit;
@@ -55,7 +56,9 @@ global $prefs_are_cached, $prefs_cache;
function cachePrefValues($username) {
global $prefs_are_cached, $prefs_cache;
+ sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
if ($prefs_are_cached) {
+ sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
return;
}
@@ -394,4 +397,4 @@ function getSig($data_dir, $username, $number) {
}
// vim: et ts=4
-?>
+?>
\ No newline at end of file