makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bug/nickvergessen/59135' into develop-olympus

Browse source 
* bug/nickvergessen/59135:
  [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)

Conflicts:
	phpBB/docs/CHANGELOG.html
This commit is contained in:
Nils Adermann 2010-04-01 18:55:16 +02:00
commit f97d0e0195
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -107,6 +107,7 @@
<li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li> <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] 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 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] 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> <li>[Feature] The memcache acm plugin now supports multiple memcache servers.</li>
</ul> </ul>

4
phpBB/includes/acp/acp_language.php
View file

@ -1120,12 +1120,12 @@ class acp_language
{ {
while (($file = readdir($dp)) !== false) while (($file = readdir($dp)) !== false)
{ {
if (!is_dir($phpbb_root_path . 'language/' . $file)) if ($file[0] == '.' || !is_dir($phpbb_root_path . 'language/' . $file))
{ {
continue; 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)) if (!in_array($file, $installed))
{ {

4
phpBB/includes/acp/acp_styles.php
View file

@ -643,13 +643,13 @@ parse_css_file = {PARSE_CSS_FILE}
{ {
while (($file = readdir($dp)) !== false) while (($file = readdir($dp)) !== false)
{ {
if (!is_dir($phpbb_root_path . 'styles/' . $file)) if ($file[0] == '.' || !is_dir($phpbb_root_path . 'styles/' . $file))
{ {
continue; continue;
} }
$subpath = ($mode != 'style') ? "$mode/" : ''; $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")) if ($cfg = file("{$phpbb_root_path}styles/$file/$subpath$mode.cfg"))
{ {