diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-02-25 16:54:27 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-02-25 16:54:27 +0100 |
| commit | bfb67286c85806fdd4293b60936d5cdedee2e702 (patch) | |
| tree | 7136c53adb6c7196c84b2b2295a781e697fa42a9 /lib/filecache.php | |
| parent | 9460c9e907f1dd80e4978e23911975bc775e7260 (diff) | |
| parent | 3cf81cadd5535b0516d73fe3de8ee91f330b4a6f (diff) | |
| download | nextcloud-server-bfb67286c85806fdd4293b60936d5cdedee2e702.tar.gz nextcloud-server-bfb67286c85806fdd4293b60936d5cdedee2e702.zip | |
fix merge conflicts
Diffstat (limited to 'lib/filecache.php')
| -rw-r--r-- | lib/filecache.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/filecache.php b/lib/filecache.php index 6ae2f8253db..faadddfb37e 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -266,7 +266,7 @@ class OC_FileCache{ if(is_array($result)){ return $result['id']; }else{ - OC_Log::write('getFieldId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG); + OC_Log::write('getFileId(): file not found in cache ('.$path.')','core',OC_Log::DEBUG); return -1; } } |