Fixed bug #10741: Create version of page crashes in Cache caused by "-" in const...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5567 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 02ec9a9..b152771 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-08  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #10741: Create version of page crashes in Cache caused by "-" in const PATTERN_ENTRYIDENTIFIER
+
 2009-06-07  Rupert Germann  <rupi@gmx.li>
        * Fixed bug #0011288: function tslib_fe->setPageCacheContent() removes page_cache entry twice
        * Fixed bug #0011289: t3lib_cache_backend_FileBackend doesn't work properly with TYPO3 running in a subdirectory to the document root (thanks to Niels Pardon )

diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
index 704be5d..84e5113 100644 (file)
--- a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
@@ -34,7 +34,7 @@
  */
 class t3lib_cache_backend_FileBackend extends t3lib_cache_backend_AbstractBackend {
 
-       const SEPARATOR = '-';
+       const SEPARATOR = '@';
 
        const FILENAME_EXPIRYTIME_FORMAT    = 'YmdHis';
        const FILENAME_EXPIRYTIME_GLOB      = '??????????????';

diff --git a/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php b/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
index d4f2019..ad24052 100644 (file)
--- a/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
+++ b/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
@@ -43,12 +43,12 @@ interface t3lib_cache_frontend_Frontend {
        /**
         * Pattern an entry identifer must match.
         */
-       const PATTERN_ENTRYIDENTIFIER = '/^[a-zA-Z0-9_%]{1,250}$/';
+       const PATTERN_ENTRYIDENTIFIER = '/^[a-zA-Z0-9_%\-&]{1,250}$/';
 
        /**
         * Pattern a tag must match.
         */
-       const PATTERN_TAG = '/^[a-zA-Z0-9_%]{1,250}$/';
+       const PATTERN_TAG = '/^[a-zA-Z0-9_%\-&]{1,250}$/';
 
        /**
         * Returns this cache's identifier