Merge branch 'master' into 2.4

This commit is contained in:
mark_story 2013-08-24 21:50:02 -04:00
commit ceb35ac39a
2 changed files with 9 additions and 1 deletions

View file

@ -394,7 +394,7 @@ class FileEngine extends CacheEngine {
return false;
}
$key = Inflector::underscore(str_replace(array(DS, '/', '.'), '_', strval($key)));
$key = Inflector::underscore(str_replace(array(DS, '/', '.', '<', '>', '?', ':', '|', '*', '"'), '_', strval($key)));
return $key;
}

View file

@ -305,6 +305,14 @@ class FileEngineTest extends CakeTestCase {
$result = Cache::clear(false, 'file_test');
$this->assertTrue($result);
$result = Cache::write('domain.test.com:8080', 'here', 'file_test');
$this->assertTrue($result);
$this->assertTrue(file_exists(CACHE . 'cake_domain_test_com_8080'));
$result = Cache::write('command>dir|more', 'here', 'file_test');
$this->assertTrue($result);
$this->assertTrue(file_exists(CACHE . 'cake_command_dir_more'));
}
/**