don't trigger the create hooks when if the file already exists for file_put_contents
This commit is contained in:
parent
3a3819b303
commit
38c563dcdc
|
@ -324,7 +324,8 @@ class View {
|
|||
return false;
|
||||
}
|
||||
} else {
|
||||
return $this->basicOperation('file_put_contents', $path, array('create', 'write'), $data);
|
||||
$hooks = ($this->file_exists($path)) ? array('write') : array('create', 'write');
|
||||
return $this->basicOperation('file_put_contents', $path, $hooks, $data);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -391,4 +391,29 @@ class View extends \PHPUnit_Framework_TestCase {
|
|||
$this->storages[] = $storage;
|
||||
return $storage;
|
||||
}
|
||||
|
||||
private $createHookPath;
|
||||
|
||||
function dummyCreateHook($params) {
|
||||
$this->createHookPath = $params['path'];
|
||||
}
|
||||
|
||||
public function testEditNoCreateHook() {
|
||||
$storage1 = $this->getTestStorage();
|
||||
$storage2 = $this->getTestStorage();
|
||||
$defaultRoot = \OC\Files\Filesystem::getRoot();
|
||||
\OC\Files\Filesystem::mount($storage1, array(), '/');
|
||||
\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot);
|
||||
\OC_Hook::connect('OC_Filesystem', 'post_create', $this, 'dummyCreateHook');
|
||||
|
||||
$view = new \OC\Files\View($defaultRoot);
|
||||
$this->hookPath = null;
|
||||
|
||||
$view->file_put_contents('/asd.txt', 'foo');
|
||||
$this->assertEquals('/asd.txt', $this->createHookPath);
|
||||
$this->createHookPath = null;
|
||||
|
||||
$view->file_put_contents('/asd.txt', 'foo');
|
||||
$this->assertNull($this->createHookPath);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue