diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:38:19 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-20 05:38:19 -0400 |
| commit | 99f7dd0fd42b4e29715c86062691877653a8b022 (patch) | |
| tree | d6bf1cdad168d21947e4b5971c5bdfcc6cf99cca /Zotlabs | |
| parent | 0c7ad924a846eef183ca442be837b69a6014075a (diff) | |
| parent | 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff) | |
| download | volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.gz volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.bz2 volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Cloud.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Dav.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Storage/BasicAuth.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 9845c5658..68d84e070 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -13,6 +13,9 @@ use \Zotlabs\Storage; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); +require_once('include/attach.php'); + + /** * @brief Fires up the SabreDAV server. * diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 9b4b576c8..ba2394388 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -14,6 +14,7 @@ use \Zotlabs\Storage; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); +require_once('include/attach.php'); /** * @brief Fires up the SabreDAV server. diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 60fc2c988..9c73b47b9 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -231,7 +231,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { } /** - * @brief Sets the timezone from the channel in RedBasicAuth. + * @brief Sets the timezone from the channel in BasicAuth. * * Set in mod/cloud.php if the channel has a timezone set. * diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 89f83c73c..f9ddb4e24 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -206,7 +206,6 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { throw new DAV\Exception\Forbidden('Permission denied.'); } - require_once('include/attach.php'); $mimetype = z_mime_content_type($name); |