mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge remote-tracking branch 'origin/3.0' into 3.1
This commit is contained in:
commit
a534b7c784
@ -15,3 +15,12 @@ See [announcement](http://www.silverstripe.org/ss-2013-009-xss-in-cms-pages-sect
|
|||||||
Due to cross-site scripting concerns when user data is used for form messages,
|
Due to cross-site scripting concerns when user data is used for form messages,
|
||||||
it is no longer possible to use HTML in `Form->sessionMessage()`, and consequently
|
it is no longer possible to use HTML in `Form->sessionMessage()`, and consequently
|
||||||
in the `FormField->validate()` API.
|
in the `FormField->validate()` API.
|
||||||
|
|
||||||
|
## Changelog
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
|
||||||
|
* 2013-09-24 [114fb59](https://github.com/silverstripe/sapphire/commit/114fb59) Auto-escape titles in TreeDropdownField (Ingo Schommer)
|
||||||
|
* 2013-09-24 [e170f4c](https://github.com/silverstripe/silverstripe-cms/commit/e170f4c) Escaping in "dependent pages" (SS-2013-009) (Ingo Schommer)
|
||||||
|
* 2013-09-20 [b383a07](https://github.com/silverstripe/sapphire/commit/b383a07) Fixing tabindex added to CreditCardField when tabindex is NULL (Sean Harvey)
|
||||||
|
* 2013-09-20 [c453ea3](https://github.com/silverstripe/sapphire/commit/c453ea3) Fixing tabindex added to CreditCardField when tabindex is NULL (Sean Harvey)
|
2
tests/cache/CacheTest.php
vendored
2
tests/cache/CacheTest.php
vendored
@ -27,7 +27,7 @@ class CacheTest extends SapphireTest {
|
|||||||
$cache->save('Good', 'cachekey');
|
$cache->save('Good', 'cachekey');
|
||||||
$this->assertEquals('Good', $cache->load('cachekey'));
|
$this->assertEquals('Good', $cache->load('cachekey'));
|
||||||
|
|
||||||
sleep(1);
|
sleep(2);
|
||||||
|
|
||||||
$this->assertFalse($cache->load('cachekey'));
|
$this->assertFalse($cache->load('cachekey'));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user