aboutsummaryrefslogtreecommitdiffstats
path: root/include/RedDAV/RedFile.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-06 23:57:28 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-06 23:57:28 +0200
commit07cd0c870f48ec838c23fa7c6966ceb1c41f06ab (patch)
tree26a1177441c40c2d3e42d3fc3617302dc2d86f12 /include/RedDAV/RedFile.php
parent2b1e6723168665039cdccb951e29c4220351367a (diff)
parent1b0cb9388cd5c416af5ba270127b14efdd1c0a6b (diff)
downloadvolse-hubzilla-07cd0c870f48ec838c23fa7c6966ceb1c41f06ab.tar.gz
volse-hubzilla-07cd0c870f48ec838c23fa7c6966ceb1c41f06ab.tar.bz2
volse-hubzilla-07cd0c870f48ec838c23fa7c6966ceb1c41f06ab.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/RedDAV/RedFile.php')
-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 0a021b5ed..d4eb6812a 100644
--- a/include/RedDAV/RedFile.php
+++ b/include/RedDAV/RedFile.php
@@ -167,7 +167,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
if($is_photo) {
require_once('include/photos.php');
$args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_path' => $f, 'filename' => $r[0]['filename'], 'getimagesize' => $gis );
- $p = photo_upload($c[0],$this->auth->observer,$args);
+ $p = photo_upload($c[0],get_app()->get_observer(),$args);
}
// update the folder's lastmodified timestamp