From 9f261213a5ad8e70dc4ab8ccd9bc76490a58763a Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 11 Nov 2008 06:21:21 +0000 Subject: Reset PasswordHash.php to its original state and exclude it from the file_structure_test --- core/tests/File_Structure_Test.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'core/tests') 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); } } -- cgit v1.2.3