diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-14 15:44:10 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-14 15:44:10 +0000 |
| commit | 3585dbd42c114a63d585e68e14f52f2a2918632a (patch) | |
| tree | b77e4cb7c5655a2e9ad44f48346bcec1894e4d39 /phpBB/install | |
| parent | e16e766409378978d4f3401613a78e0428f2a46a (diff) | |
| download | forums-3585dbd42c114a63d585e68e14f52f2a2918632a.tar forums-3585dbd42c114a63d585e68e14f52f2a2918632a.tar.gz forums-3585dbd42c114a63d585e68e14f52f2a2918632a.tar.bz2 forums-3585dbd42c114a63d585e68e14f52f2a2918632a.tar.xz forums-3585dbd42c114a63d585e68e14f52f2a2918632a.zip | |
a bunch of fixes
git-svn-id: file:///svn/phpbb/trunk@7884 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rwxr-xr-x | phpBB/install/install_install.php | 7 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 68bf1f9a84..7db99eb56a 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1704,7 +1704,12 @@ class install_install extends module { $path = $phpbb_root_path . 'language/' . $file; - if (is_dir($path) && !is_link($path) && file_exists($path . '/iso.txt')) + if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS') + { + continue; + } + + if (is_dir($path) && file_exists($path . '/iso.txt')) { $lang_file = file("{$phpbb_root_path}language/$path/iso.txt"); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 4c4912a2ab..0659e1f364 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -454,7 +454,7 @@ class install_update extends module { if (substr(strrchr($entry, '.'), 1) == 'css') { - $file_list[] = $entry; + $file_list[] = "{$phpbb_root_path}styles/{$theme['theme_path']}/theme/{$entry}"; } } closedir($dir); |