summaryrefslogtreecommitdiffstats
path: root/lib/files/storage/local.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-22 23:27:04 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-22 23:27:04 +0100
commitf85838177596b3214430e750b5425bfe3c0cde86 (patch)
tree996508bfcf929bcd9be646b309724cd3b0622810 /lib/files/storage/local.php
parent9a1f65aab176604c90114891b4bc0346fbb7d561 (diff)
parentec8609fa2186f03f5dde215bc7ed06f47cbe47ba (diff)
downloadnextcloud-server-f85838177596b3214430e750b5425bfe3c0cde86.tar.gz
nextcloud-server-f85838177596b3214430e750b5425bfe3c0cde86.zip
merge master into filesystem
Diffstat (limited to 'lib/files/storage/local.php')
-rw-r--r--lib/files/storage/local.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index 53e1c5b4f01..9fc9d375bb3 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -101,7 +101,7 @@ class Local extends \OC\Files\Storage\Common{
public function file_get_contents($path) {
return file_get_contents($this->datadir.$path);
}
- public function file_put_contents($path, $data) {
+ public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
return file_put_contents($this->datadir.$path, $data);
}
public function unlink($path) {