diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 2 | ||||
| -rw-r--r-- | modules/simpletest/simpletest.install | 4 | ||||
| -rw-r--r-- | modules/simpletest/simpletest.module | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 5bfba7c62..10f1e1390 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -467,7 +467,7 @@ class DrupalWebTestCase { if (in_array($type, array('binary', 'html', 'image', 'javascript', 'php', 'sql', 'text'))) { // Use original file directory instead of one created during setUp(). $path = $this->original_file_directory . '/simpletest'; - $files = file_scan_directory($path, $type . '\-.*'); + $files = file_scan_directory($path, '/' . $type . '\-.*/'); // If size is set then remove any files that are not of that size. if ($size !== NULL) { diff --git a/modules/simpletest/simpletest.install b/modules/simpletest/simpletest.install index c6d5c34c7..4d549399b 100644 --- a/modules/simpletest/simpletest.install +++ b/modules/simpletest/simpletest.install @@ -28,10 +28,10 @@ function simpletest_install() { } // Copy other test files for consistency. - $files = file_scan_directory($path, '(html|image|javascript|php|sql)-.*'); + $files = file_scan_directory($path, '/(html|image|javascript|php|sql)-.*/'); if (count($files) == 0) { $original = drupal_get_path('module', 'simpletest') . '/files'; - $files = file_scan_directory($original, '(html|image|javascript|php|sql)-.*'); + $files = file_scan_directory($original, '/(html|image|javascript|php|sql)-.*/'); foreach ($files as $file) { file_copy($file->filename, $path . '/' . $file->basename); } diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index abeb8c14b..138045f83 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -435,7 +435,7 @@ function simpletest_get_all_tests() { $tests_directory = $module_path . '/tests'; if (is_dir($tests_directory)) { - foreach (file_scan_directory($tests_directory, '\.test$') as $file) { + foreach (file_scan_directory($tests_directory, '/\.test$/') as $file) { $files[] = $file->filename; } } diff --git a/modules/system/system.module b/modules/system/system.module index 30bc90980..ef1735e1f 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1003,9 +1003,9 @@ function _system_theme_data() { if (empty($themes_info)) { // Find themes - $themes = drupal_system_listing('\.info$', 'themes'); + $themes = drupal_system_listing('/\.info$/', 'themes'); // Find theme engines - $engines = drupal_system_listing('\.engine$', 'themes/engines'); + $engines = drupal_system_listing('/\.engine$/', 'themes/engines'); $defaults = system_theme_default(); |