summaryrefslogtreecommitdiff
path: root/includes/filetransfer
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-17 19:14:42 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-08-17 19:14:42 +0000
commitb41323642bffd3761f73a8c9dc8260546d7533f1 (patch)
tree1a0530685d18eb01e0356fbed7de91aba00405e9 /includes/filetransfer
parent0138e3946ab2458ffb97066d4b8a0cd94d83e516 (diff)
downloadbrdo-b41323642bffd3761f73a8c9dc8260546d7533f1.tar.gz
brdo-b41323642bffd3761f73a8c9dc8260546d7533f1.tar.bz2
#517814 by jmstacey, justinrandell, pwolanin, drewish, Jody Lynn, aaron, dopry, and c960657: Converted File API to stream wrappers, for enhanced private/public file handling, and the ability to reference other storage mechanisms such as s3:// and flicker://.
Diffstat (limited to 'includes/filetransfer')
-rw-r--r--includes/filetransfer/filetransfer.inc2
-rw-r--r--includes/filetransfer/ftp.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/filetransfer/filetransfer.inc b/includes/filetransfer/filetransfer.inc
index 66e0f5787..2b1c18c7e 100644
--- a/includes/filetransfer/filetransfer.inc
+++ b/includes/filetransfer/filetransfer.inc
@@ -114,7 +114,7 @@ abstract class FileTransfer {
* A path to check against the jail.
*/
protected final function checkPath($path) {
- if (realpath(substr($path, 0, strlen($this->jail))) !== $this->jail) {
+ if (drupal_realpath(substr($path, 0, strlen($this->jail))) !== $this->jail) {
throw new FileTransferException('@directory is outside of the @jail', NULL, array('@directory' => $path, '@jail' => $this->jail));
}
}
diff --git a/includes/filetransfer/ftp.inc b/includes/filetransfer/ftp.inc
index ecb164a17..008a20c55 100644
--- a/includes/filetransfer/ftp.inc
+++ b/includes/filetransfer/ftp.inc
@@ -19,7 +19,7 @@ class FileTransferFTPWrapper extends FileTransfer {
}
function createDirectoryJailed($directory) {
- if (!@mkdir($directory)) {
+ if (!@drupal_mkdir($directory)) {
$exception = new FileTransferException('Cannot create directory @directory.', NULL, array('@directory' => $directory));
throw $exception;
}