Merge remote-tracking branch 'origin/master' into overridablelangstrings

Conflicts:
	inc/plugin.php

1 files changed, 8 insertions, 2 deletions

diff --git a/_test/tests/inc/cache_use.test.php b/_test/tests/inc/cache_use.test.php
index c54a472a3..3ea212d50 100644
--- a/_test/tests/inc/cache_use.test.php
+++ b/_test/tests/inc/cache_use.test.php
@@ -18,14 +18,20 @@ class cache_use_test extends DokuWikiTest {
         $conf['cachetime'] = 0;  // ensure the value is not -1, which disables caching
 
         saveWikiText($ID, 'Content', 'Created');
-        // set the modification time a second in the past in order to ensure that the cache is newer than the page
-        touch($file, time()-1);
 
         $this->cache = new cache_renderer($ID, $file, 'xhtml');
         $this->cache->storeCache('Test');
+
+        // set the modification times explicitly (overcome Issue #694)
+        $time = time();
+        touch($file, $time-1);
+        touch($this->cache->cache, $time);
     }
 
     function test_use() {
+        $this->markTestSkipped('Disabled until Ticket #694 has been fixed');
+        return;
+
         $this->assertTrue($this->cache->useCache());
     }