diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-08-28 18:42:39 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-08-28 18:42:39 +0000 |
| commit | 0fe3f48d86e643dacec6660ff98523c281809382 (patch) | |
| tree | 1e82160938e51d7e4de453014af0e6f36c550f43 | |
| parent | 547a686381738fcb93a16894a331d96cdfba6f82 (diff) | |
| download | elgg-0fe3f48d86e643dacec6660ff98523c281809382.tar.gz elgg-0fe3f48d86e643dacec6660ff98523c281809382.tar.bz2 | |
Closes #313, Fixes #274: Resolved strange OSX language file browsing, including speculative windows fix. Thanks for the patch!
git-svn-id: https://code.elgg.org/elgg/trunk@2044 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/languages.php | 2 | ||||
| -rw-r--r-- | engine/start.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php index 5292b5403..1e2714d77 100644 --- a/engine/lib/languages.php +++ b/engine/lib/languages.php @@ -86,7 +86,7 @@ if ($handle = opendir($path)) {
while ($language = readdir($handle)) {
- if (!in_array($language,array('.','..','.svn','CVS')) && !is_dir($path . $language)) {
+ if (!in_array($language,array('.','..','.svn','CVS', '.DS_Store', 'Thumbs.db',)) && !is_dir($path . $language)) {
@include($path . $language);
}
}
diff --git a/engine/start.php b/engine/start.php index 174c8f8b4..dc785974b 100644 --- a/engine/start.php +++ b/engine/start.php @@ -107,7 +107,9 @@ // We don't want to load or reload these files
$file_exceptions = array(
- '.','..',
+ '.','..', + '.DS_Store', + 'Thumbs.db',
'.svn',
'CVS','cvs',
'settings.php','settings.example.php','languages.php','exceptions.php','elgglib.php','database.php','actions.php','sessions.php'
|