when storing back the data field 'encrypted' it is necessary to cast the boolean...

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index fdbce0d51fee454d2d7d841ac71a133c97c1bacb..d296c6068653c2c1bdecf43950539215bf68c5bd 100644 (file)
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -121,6 +121,8 @@ class Scanner extends BasicEmitter {
                                                                        }
                                                                        $parentCacheData = $this->cache->get($parent);
                                                                        $parentCacheData['etag'] = $this->storage->getETag($parent);
+                                                                       // the boolean to int conversion is necessary to make pg happy
+                                                                       $parentCacheData['encrypted'] = $parentCacheData['encrypted'] ? 1 : 0;
                                                                        $this->cache->put($parent, $parentCacheData);
                                                                }
                                                        }

diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index b137799bbcfc078f447962356cb49da95170d439..8112eada17cc651e37e4153d8fc0f0a825cf3a88 100644 (file)
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -195,6 +195,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
                $data1 = $this->cache->get('folder');
                $data2 = $this->cache->get('');
                $data0['etag'] = '';
+               $data0['encrypted'] = $data0['encrypted'] ? 1: 0;
                $this->cache->put('folder/bar.txt', $data0);
 
                // rescan