diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-18 15:07:27 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-18 15:07:27 +0000 |
commit | c03b4c540823c8e9179fdcd93302a7630bbf0d94 (patch) | |
tree | 29d354e36433b2b93e3eaa30ad1ead4a7255d8f5 /includes/locale.inc | |
parent | fb7347bc9d260193f00619fed4b9681670595dc4 (diff) | |
download | brdo-c03b4c540823c8e9179fdcd93302a7630bbf0d94.tar.gz brdo-c03b4c540823c8e9179fdcd93302a7630bbf0d94.tar.bz2 |
#255551 by drewish and c960657: Array-itize file_scan_directory()'s parameters (DX improvement).
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 46f268ed6..10e9729bf 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -2617,7 +2617,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$/', '/(\.\.?|CVS)$/', 0, FALSE)); + $files = array_merge($files, file_scan_directory(dirname($component->filename) . '/translations', '/(^|\.)' . $langcode . '\.po$/', array('recurse' => FALSE))); $components[] = $component->name; } @@ -2649,7 +2649,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$/', '/(\.\.?|CVS)$/', 0, FALSE)); + $files = array_merge($files, file_scan_directory(dirname($component->filename) . '/translations', '/(^|\.)(' . $language_list . ')\.po$/', array('recurse' => FALSE))); } } return _locale_batch_build($files, $finished); |