aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-07 07:13:33 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-07 07:13:33 +0100
commitce4bb8e5ecd502ba8420dea93256ba4fbebf49ff (patch)
tree924b094d38bd32fae2af56976e12ab5f38541037 /include
parentc40f6060da9c014135e70f165fa7adbfb127bcf2 (diff)
parent81544538032500c05a14fc90902e2930b1c4b03a (diff)
downloadvolse-hubzilla-ce4bb8e5ecd502ba8420dea93256ba4fbebf49ff.tar.gz
volse-hubzilla-ce4bb8e5ecd502ba8420dea93256ba4fbebf49ff.tar.bz2
volse-hubzilla-ce4bb8e5ecd502ba8420dea93256ba4fbebf49ff.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
-rw-r--r--include/RedDAV/RedFile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php
index 2bc3f40e5..3283a6e88 100644
--- a/include/RedDAV/RedFile.php
+++ b/include/RedDAV/RedFile.php
@@ -127,7 +127,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
}
$fname = dbunescbin($d[0]['data']);
if(strpos($fname,'store') === false)
- $f = 'store/' . $this->auth->owner_nick . '/' . (($fname) ? $fname : '');
+ $f = 'store/' . $this->auth->owner_nick . '/' . $fname ;
else
$f = $fname;