Fixed file not found issue

This fixes an issue where the second call would miss the "/files" part.

The path attribute must keep "files" so that the next call to the File
instance will still have the correct one.

Fixes #155
pull/1/head
Vincent Petry 11 years ago
parent 0b8fce39c2
commit aed7ed77d2

@ -177,17 +177,18 @@ class File {
/* to emit hooks properly, view root should contain /user/files */ /* to emit hooks properly, view root should contain /user/files */
if (strpos($this->path, 'files') === 0){ if (strpos($this->path, 'files') === 0){
$this->path = preg_replace('|^files|', '', $this->path); $path = preg_replace('|^files|', '', $this->path);
$view = new View('/' . $this->owner . '/files'); $view = new View('/' . $this->owner . '/files');
} else { } else {
$path = $this->path;
$view = new View('/' . $this->owner); $view = new View('/' . $this->owner);
} }
if (!$view->file_exists($this->path)){ if (!$view->file_exists($path)){
throw new \Exception($this->path . ' doesn\'t exist'); throw new \Exception($this->path . ' doesn\'t exist');
} }
return array($view, $this->path); return array($view, $path);
} }
public function getOwner(){ public function getOwner(){

Loading…
Cancel
Save