diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-18 23:11:40 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-18 23:11:40 +0100 |
| commit | c2ba24558ff79174af9aaf2bee274529c794cac8 (patch) | |
| tree | 7fbaec3c305d2189cc51845b56d254ae6ac0e704 /phpBB | |
| parent | 959bc183bf21e77c694ac0b68cbda5b93ae79cd0 (diff) | |
| download | forums-c2ba24558ff79174af9aaf2bee274529c794cac8.tar forums-c2ba24558ff79174af9aaf2bee274529c794cac8.tar.gz forums-c2ba24558ff79174af9aaf2bee274529c794cac8.tar.bz2 forums-c2ba24558ff79174af9aaf2bee274529c794cac8.tar.xz forums-c2ba24558ff79174af9aaf2bee274529c794cac8.zip | |
[feature/avatars] Fix local and upload avatar in the ACP
PHPBB3-10018
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_avatar_options_local.html | 7 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/local.php | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_avatar_options_local.html b/phpBB/adm/style/acp_avatar_options_local.html index 02ff58fe15..b317cd2aa5 100644 --- a/phpBB/adm/style/acp_avatar_options_local.html +++ b/phpBB/adm/style/acp_avatar_options_local.html @@ -17,11 +17,10 @@ <!-- END av_local_col --> </tr> <tr> - <!-- BEGIN av_local_col --> - <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> - <!-- END 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.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_option --> </tr> <!-- END av_local_row --> </table> <!-- ENDIF --> -</dl> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index b38d61bef3..e96adcee90 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -17,7 +17,7 @@ </div> <!-- 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> <legend>{L_GROUP_DETAILS}</legend> diff --git a/phpBB/includes/avatar/driver/local.php b/phpBB/includes/avatar/driver/local.php index 080921c325..cdee983d9e 100644 --- a/phpBB/includes/avatar/driver/local.php +++ b/phpBB/includes/avatar/driver/local.php @@ -91,11 +91,12 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver $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_NAME' => $img['name'], - 'AVATAR_FILE' => $img['filename'], + 'AVATAR_NAME' => $img['name'], + 'AVATAR_FILE' => $img['filename'], )); $template->assign_block_vars('av_local_row.av_local_option', array( + 'AVATAR_FILE' => $img['filename'], 'S_OPTIONS_AVATAR' => $img['filename'] )); |