diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-11-16 19:41:14 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-11-16 19:41:14 +0000 |
| commit | dc65b62aceddb0dc5f7b61bd1f1f3d46015a5969 (patch) | |
| tree | 7e569b903521dd48564ba4feff2cc544fdb3be23 /install.php | |
| parent | a6b4f3b61f2a73e87e19eaa68f31a3687561e266 (diff) | |
| download | brdo-dc65b62aceddb0dc5f7b61bd1f1f3d46015a5969.tar.gz brdo-dc65b62aceddb0dc5f7b61bd1f1f3d46015a5969.tar.bz2 | |
- Patch #74645 by drewish, roychri et al: modify file_scan_directory to use a regex for the nomask (and code clean-up).
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install.php b/install.php index c30b302d6..a510df20c 100644 --- a/install.php +++ b/install.php @@ -409,7 +409,7 @@ function install_settings_form_submit($form, &$form_state) { * Find all .profile files. */ function install_find_profiles() { - return file_scan_directory('./profiles', '/\.profile$/', array('.', '..', 'CVS'), 0, TRUE, 'name', 0); + return file_scan_directory('./profiles', '/\.profile$/', '/(\.\.?|CVS)$/', 0, TRUE, 'name', 0); } /** @@ -495,7 +495,7 @@ function install_select_profile_form(&$form_state, $profile_files) { * Find all .po files for the current profile. */ function install_find_locales($profilename) { - $locales = file_scan_directory('./profiles/' . $profilename . '/translations', '/\.po$/', array('.', '..', 'CVS'), 0, FALSE); + $locales = file_scan_directory('./profiles/' . $profilename . '/translations', '/\.po$/', '/(\.\.?|CVS)$/', 0, FALSE); array_unshift($locales, (object) array('name' => 'en')); return $locales; } |