projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle subfolders as sent too!
[squirrelmail.git]
/
functions
/
file_prefs.php
diff --git
a/functions/file_prefs.php
b/functions/file_prefs.php
index fb4f706d7586f7d2d0f6bb345dda81435b392b55..823423cf54d735334c31210323ede1a6cadd578a 100644
(file)
--- a/
functions/file_prefs.php
+++ b/
functions/file_prefs.php
@@
-109,14
+109,17
@@
function cachePrefValues($data_dir, $username) {
function getPref($data_dir, $username, $pref_name, $default = '') {
global $prefs_cache;
function getPref($data_dir, $username, $pref_name, $default = '') {
global $prefs_cache;
- $result = do_hook('get_pref_override', $temp=array(&$username, &$pref_name));
- if (!$result) {
+ $temp = array(&$username, &$pref_name);
+ $result = do_hook('get_pref_override', $temp);
+ if (is_null($result)) {
cachePrefValues($data_dir, $username);
if (isset($prefs_cache[$pref_name])) {
$result = $prefs_cache[$pref_name];
} else {
cachePrefValues($data_dir, $username);
if (isset($prefs_cache[$pref_name])) {
$result = $prefs_cache[$pref_name];
} else {
- $result = do_hook('get_pref', $temp=array(&$username, &$pref_name));
- if (!$result) {
+//FIXME: is there a justification for having two prefs hooks so close? who uses them?
+ $temp = array(&$username, &$pref_name);
+ $result = do_hook('get_pref', $temp);
+ if (is_null($result)) {
$result = $default;
}
}
$result = $default;
}
}