mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5245 from owncloud/file_put_contents-no-create 

don't trigger the create hooks when if the file already exists for file_put_contents
This commit is contained in:
Frank Karlitschek 2013-10-10 01:20:07 -07:00
parent 3a3819b303 38c563dcdc
commit ec4fd35468
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/files/view.php
View File

@ -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);
}
}

25
tests/lib/files/view.php
View File

@ -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);
}
}