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

[feature/avatars] Fix local and upload avatar in the ACP

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-11-18 23:11:40 +01:00
parent 959bc183bf
commit c2ba24558f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/adm/style/acp_avatar_options_local.html
View file

@ -17,11 +17,10 @@
<!-- END av_local_col --> <!-- END av_local_col -->
</tr> </tr>
<tr> <tr>
<!-- BEGIN av_local_col --> <!-- BEGIN av_local_option -->
<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_local_col.AVATAR_FILE}" /></td> <td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_option.S_ROW_COUNT}" value="{av_local_row.av_local_option.AVATAR_FILE}" /></td>
<!-- END av_local_col --> <!-- END av_local_option -->
</tr> </tr>
<!-- END av_local_row --> <!-- END av_local_row -->
</table> </table>
<!-- ENDIF --> <!-- ENDIF -->
</dl>

2
phpBB/adm/style/acp_groups.html
View file

@ -17,7 +17,7 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF -->> <form id="settings" method="post" action="{U_ACTION}"<!-- IF S_CAN_UPLOAD --> enctype="multipart/form-data"<!-- ENDIF --> enctype="multipart/form-data">
<fieldset> <fieldset>
<legend>{L_GROUP_DETAILS}</legend> <legend>{L_GROUP_DETAILS}</legend>

5
phpBB/includes/avatar/driver/local.php
View file

@ -91,11 +91,12 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
$template->assign_block_vars('av_local_row.av_local_col', array( $template->assign_block_vars('av_local_row.av_local_col', array(
'AVATAR_IMAGE' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'], 'AVATAR_IMAGE' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
'AVATAR_NAME' => $img['name'], 'AVATAR_NAME' => $img['name'],
'AVATAR_FILE' => $img['filename'], 'AVATAR_FILE' => $img['filename'],
)); ));
$template->assign_block_vars('av_local_row.av_local_option', array( $template->assign_block_vars('av_local_row.av_local_option', array(
'AVATAR_FILE' => $img['filename'],
'S_OPTIONS_AVATAR' => $img['filename'] 'S_OPTIONS_AVATAR' => $img['filename']
)); ));