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

#8784

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7287 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-04-06 15:07:33 +00:00
parent ba536c6270
commit 25fc4fdb66
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1452,7 +1452,7 @@ parse_css_file = {PARSE_CSS_FILE}
{ {
while (($file = readdir($dp)) !== false) while (($file = readdir($dp)) !== false)
{ {
if (!is_file($dir . '/' . $file) && !is_link($dir . '/' . $file) && $file[0] != '.' && strtoupper($file) != 'CVS' && !sizeof($imagesetlist['lang'])) if (!is_file($dir . '/' . $file) && !is_link($dir . '/' . $file) && $file[0] != '.' && strtoupper($file) != 'CVS')
{ {
$dp2 = @opendir("$dir/$file"); $dp2 = @opendir("$dir/$file");
@ -1463,10 +1463,9 @@ parse_css_file = {PARSE_CSS_FILE}
while (($file2 = readdir($dp2)) !== false) while (($file2 = readdir($dp2)) !== false)
{ {
$imglang = $file;
if (preg_match('#\.(?:gif|jpg|png)$#', $file2)) if (preg_match('#\.(?:gif|jpg|png)$#', $file2))
{ {
$imagesetlist['lang'][] = "$file/$file2"; $imagesetlist['all_lang'][$file][] = "$file/$file2";
} }
} }
closedir($dp2); closedir($dp2);
@ -1481,7 +1480,29 @@ parse_css_file = {PARSE_CSS_FILE}
// Make sure the list of possible images is sorted alphabetically // Make sure the list of possible images is sorted alphabetically
sort($imagesetlist['nolang']); sort($imagesetlist['nolang']);
sort($imagesetlist['lang']); foreach ($imagesetlist['all_lang'] as $lang => $data)
{
sort($imagesetlist['all_lang'][$lang]);
}
if (isset($imagesetlist['all_lang'][$user->img_lang]) && sizeof($imagesetlist['all_lang'][$user->img_lang]))
{
$imglang = $lang;
$imagesetlist['lang'] = $imagesetlist['all_lang'][$user->img_lang];
}
else
{
foreach ($imagesetlist['all_lang'] as $lang => $data)
{
if (sizeof($imagesetlist['all_lang'][$user->img_lang]))
{
$imglang = $lang;
$imagesetlist['lang'] = $imagesetlist['all_lang'][$lang];
break;
}
}
}
unset($imagesetlist['all_lang']);
$imagesetlist_options = ''; $imagesetlist_options = '';
foreach ($imagesetlist as $type => $img_ary) foreach ($imagesetlist as $type => $img_ary)