tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.1' into 3.2

Browse Source
This commit is contained in:
Daniel Hensby 2016-05-20 12:24:47 +01:00
commit 0c3d30e621
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/manifest/ClassManifest.php
View File

@ -493,8 +493,7 @@ class SS_ClassManifest {
// files will have changed and TokenisedRegularExpression is quite // files will have changed and TokenisedRegularExpression is quite
// slow. A combination of the file name and file contents hash are used, // slow. A combination of the file name and file contents hash are used,
// since just using the datetime lead to problems with upgrading. // since just using the datetime lead to problems with upgrading.
$file = file_get_contents($pathname); $key = preg_replace('/[^a-zA-Z0-9_]/', '_', $basename) . '_' . md5_file($pathname);
$key = preg_replace('/[^a-zA-Z0-9_]/', '_', $basename) . '_' . md5($file);
if ($data = $this->cache->load($key)) { if ($data = $this->cache->load($key)) {
$valid = ( $valid = (
@ -513,7 +512,7 @@ class SS_ClassManifest {
} }
if (!$classes) { if (!$classes) {
$tokens = token_get_all($file); $tokens = token_get_all(file_get_contents($pathname));
$classes = self::get_namespaced_class_parser()->findAll($tokens); $classes = self::get_namespaced_class_parser()->findAll($tokens);