diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2008-11-11 06:21:21 +0000 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2008-11-11 06:21:21 +0000 |
commit | 9f261213a5ad8e70dc4ab8ccd9bc76490a58763a (patch) | |
tree | 153f2663fd1d23319c80eb854719b4d36cf7c4cd /core | |
parent | dae36c2aa4afebb38cc3235b46c6490b2f771aa1 (diff) |
Reset PasswordHash.php to its original state and exclude it from the file_structure_test
Diffstat (limited to 'core')
-rw-r--r-- | core/tests/File_Structure_Test.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/tests/File_Structure_Test.php b/core/tests/File_Structure_Test.php index e4ea7230..d8649896 100644 --- a/core/tests/File_Structure_Test.php +++ b/core/tests/File_Structure_Test.php @@ -116,14 +116,15 @@ class GalleryCodeFilterIterator extends FilterIterator { public function accept() { // Skip anything that we didn't write $path_name = $this->getInnerIterator()->getPathName(); - return !(strstr($path_name, ".svn") || + return !(strpos($path_name, ".svn") || substr($path_name, -1, 1) == "~" || - strstr($path_name, SYSPATH) !== false || - strstr($path_name, MODPATH . 'forge') !== false || - strstr($path_name, MODPATH . 'unit_test') !== false || - strstr($path_name, MODPATH . 'mptt') !== false || - strstr($path_name, MODPATH . 'kodoc') !== false || - strstr($path_name, DOCROOT . 'var') !== false || - strstr($path_name, DOCROOT . 'test') !== false); + strpos($path_name, SYSPATH) !== false || + strpos($path_name, MODPATH . 'forge') !== false || + strpos($path_name, MODPATH . 'unit_test') !== false || + strpos($path_name, MODPATH . 'mptt') !== false || + strpos($path_name, MODPATH . 'kodoc') !== false || + strpos($path_name, MODPATH . 'user/libraries/PasswordHash') !== false || + strpos($path_name, DOCROOT . 'var') !== false || + strpos($path_name, DOCROOT . 'test') !== false); } } |