From d0ffe48144d3151147339d1e3f61f7b18b9b4c27 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 29 Aug 2016 12:56:35 +0200 Subject: [PATCH] Sqlfs::mkdir is no longer static, fixing some left over static calls --- api/src/Vfs/Sqlfs/StreamWrapper.php | 2 +- api/src/Vfs/Sqlfs/Utils.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/Vfs/Sqlfs/StreamWrapper.php b/api/src/Vfs/Sqlfs/StreamWrapper.php index 75f44d363c..2e2022b8c0 100644 --- a/api/src/Vfs/Sqlfs/StreamWrapper.php +++ b/api/src/Vfs/Sqlfs/StreamWrapper.php @@ -727,7 +727,7 @@ class StreamWrapper extends Api\Db\Pdo implements Vfs\StreamWrapperIface if (($options & STREAM_MKDIR_RECURSIVE) && $parent_path != '/' && !$parent) { if (self::LOG_LEVEL > 1) error_log(__METHOD__." creating parents: $parent_path, $mode"); - if (!self::mkdir($parent_path,$mode,$options)) + if (!$this->mkdir($parent_path,$mode,$options)) { return false; } diff --git a/api/src/Vfs/Sqlfs/Utils.php b/api/src/Vfs/Sqlfs/Utils.php index 16dee0d856..0e3f82f209 100644 --- a/api/src/Vfs/Sqlfs/Utils.php +++ b/api/src/Vfs/Sqlfs/Utils.php @@ -327,7 +327,7 @@ class Utils extends StreamWrapper if (!($lostnfound = $sqlfs->url_stat(self::LOST_N_FOUND, STREAM_URL_STAT_QUIET))) { Vfs::$is_root = true; - if (!self::mkdir(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD, 0) || + if (!$sqlfs->mkdir(self::LOST_N_FOUND, self::LOST_N_FOUND_MOD, 0) || !(!($admins = $GLOBALS['egw']->accounts->name2id(self::LOST_N_FOUND_GRP)) || self::chgrp(self::LOST_N_FOUND, $admins) && self::chmod(self::LOST_N_FOUND,self::LOST_N_FOUND_MOD)) || !($lostnfound = $sqlfs->url_stat(self::LOST_N_FOUND, STREAM_URL_STAT_QUIET)))