bring up fix for default_pref file name (double-slash)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5003 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index 86fda6224e4e3214b0f8d73401551003c4aa9c60..5ed99124d85beb1d3cdb3d68d27c78a30f7d0f0b 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -182,7 +182,10 @@ function checkForPrefs($data_dir, $username, $filename = '') {
     /* Then, check if the file exists. */
     if (!@file_exists($filename) ) {
         /* First, check the $data_dir for the default preference file. */
-        $default_pref = $data_dir . '/default_pref';
+        if(substr($data_dir,-1) != '/') {
+            $data_dir .= '/';
+        }
+        $default_pref = $data_dir . 'default_pref';
 
         /* If it is not there, check the internal data directory. */
         if (!@file_exists($default_pref)) {