diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-09-20 03:49:24 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-09-20 03:49:24 +0000 |
| commit | 89b4c55989eb0a1d2263de3a4a78c179f458cfee (patch) | |
| tree | a125af0b0636ecaf984673dffbfe91dccefcfa56 /includes/locale.inc | |
| parent | 67f93fcb161f8ba5bb2c87626f3ef8874e7acffa (diff) | |
| download | brdo-89b4c55989eb0a1d2263de3a4a78c179f458cfee.tar.gz brdo-89b4c55989eb0a1d2263de3a4a78c179f458cfee.tar.bz2 | |
#64967 follow-up by drewish: Replace ereg with preg in file_scan_directory().
Diffstat (limited to 'includes/locale.inc')
| -rw-r--r-- | includes/locale.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 483497a6f..b06390265 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -2479,7 +2479,7 @@ function locale_batch_by_language($langcode, $finished = NULL, $skip = array()) // with names ending with $langcode.po. This allows for filenames // like node-module.de.po to let translators use small files and // be able to import in smaller chunks. - $files = array_merge($files, file_scan_directory(dirname($component->filename) . '/translations', '(^|\.)' . $langcode . '\.po$', array('.', '..', 'CVS'), 0, FALSE)); + $files = array_merge($files, file_scan_directory(dirname($component->filename) . '/translations', '/(^|\.)' . $langcode . '\.po$/', array('.', '..', 'CVS'), 0, FALSE)); $components[] = $component->name; } @@ -2511,7 +2511,7 @@ function locale_batch_by_component($components, $finished = '_locale_batch_syste // as $langcode.po or with names ending with $langcode.po. This allows // for filenames like node-module.de.po to let translators use small // files and be able to import in smaller chunks. - $files = array_merge($files, file_scan_directory(dirname($component->filename) . '/translations', '(^|\.)(' . $language_list . ')\.po$', array('.', '..', 'CVS'), 0, FALSE)); + $files = array_merge($files, file_scan_directory(dirname($component->filename) . '/translations', '/(^|\.)(' . $language_list . ')\.po$/', array('.', '..', 'CVS'), 0, FALSE)); } } return _locale_batch_build($files, $finished); |