diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-11-15 12:04:44 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-11-15 12:04:44 +0000 |
| commit | 918d33f41fa1cb693c4c7e23c6954dfb208e5b1e (patch) | |
| tree | d9374cb9aef136a9ac5fe9151b2c433865fc37a4 | |
| parent | c0ea04814af3bafd2fa486f240e9ff7c547c7402 (diff) | |
| download | brdo-918d33f41fa1cb693c4c7e23c6954dfb208e5b1e.tar.gz brdo-918d33f41fa1cb693c4c7e23c6954dfb208e5b1e.tar.bz2 | |
- Modified patch #7235: do a better job checking the OS and acting upon it.
| -rw-r--r-- | includes/file.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/file.inc b/includes/file.inc index a6f79b3ba..0eda14c6c 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -12,11 +12,12 @@ * Common file handling functions. */ +define('IS_WINDOWS', substr(PHP_OS, 0, 3) == 'WIN'); define('FILE_DOWNLOADS_PUBLIC', 1); define('FILE_DOWNLOADS_PRIVATE', 2); define('FILE_CREATE_DIRECTORY', 1); define('FILE_MODIFY_PERMISSIONS', 2); -define('FILE_DIRECTORY_TEMP', PHP_OS == 'WINNT' ? 'c:\\windows\\temp' : '/tmp'); +define('FILE_DIRECTORY_TEMP', IS_WINDOWS ? 'c:\\windows\\temp' : '/tmp'); define('FILE_EXISTS_RENAME', 0); define('FILE_EXISTS_REPLACE', 1); define('FILE_EXISTS_ERROR', 2); @@ -52,7 +53,7 @@ function file_create_path($dest = 0) { return variable_get('file_directory_path', 'files'); } - $regex = (PHP_OS == 'WINNT' ? '.?:\\\\' : '/'); + $regex = (IS_WINDOWS ? '.?:\\\\' : '/'); if (!file_check_location($dest, variable_get('file_directory_path', 'files')) && !preg_match("|^$regex|", $dest)) { return variable_get('file_directory_path', 'files') .'/'. trim($dest, '\\/'); } |