diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-04-01 18:55:16 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-04-01 18:55:16 +0200 |
| commit | f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3 (patch) | |
| tree | fe58d6d43383c3bec043ca971b0e1e9ce8011123 /phpBB | |
| parent | e35392cb4f86738cb8daa80d43c1e80558cf3edc (diff) | |
| parent | 4349bec316e93ed6feac3ad7e56e54b6320aa960 (diff) | |
| download | forums-f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3.tar forums-f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3.tar.gz forums-f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3.tar.bz2 forums-f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3.tar.xz forums-f97d0e0195de5f7d0d6ad4a4c5663b95971f96f3.zip | |
Merge branch 'bug/nickvergessen/59135' into develop-olympus
* bug/nickvergessen/59135:
[bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)
Conflicts:
phpBB/docs/CHANGELOG.html
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5e6a0dbd86..a471ae0cf6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -107,6 +107,7 @@ <li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li> <li>[Fix] Redirect search engines that access pages with SIDs in the URL. (Bug #58025)</li> <li>[Fix] Fix incorrect ampersand encoding in redirect parameter. (Bug #58465)</li> + <li>[Fix] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> <li>[Feature] The memcache acm plugin now supports multiple memcache servers.</li> </ul> diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index fedae6fe67..c2cb2f9c11 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -1120,12 +1120,12 @@ class acp_language { while (($file = readdir($dp)) !== false) { - if (!is_dir($phpbb_root_path . 'language/' . $file)) + if ($file[0] == '.' || !is_dir($phpbb_root_path . 'language/' . $file)) { continue; } - if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt")) + if (file_exists("{$phpbb_root_path}language/$file/iso.txt")) { if (!in_array($file, $installed)) { diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index d2a0f9210f..3310560c73 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -643,13 +643,13 @@ parse_css_file = {PARSE_CSS_FILE} { while (($file = readdir($dp)) !== false) { - if (!is_dir($phpbb_root_path . 'styles/' . $file)) + if ($file[0] == '.' || !is_dir($phpbb_root_path . 'styles/' . $file)) { continue; } $subpath = ($mode != 'style') ? "$mode/" : ''; - if ($file[0] != '.' && file_exists("{$phpbb_root_path}styles/$file/$subpath$mode.cfg")) + if (file_exists("{$phpbb_root_path}styles/$file/$subpath$mode.cfg")) { if ($cfg = file("{$phpbb_root_path}styles/$file/$subpath$mode.cfg")) { |