diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2010-01-31 14:47:34 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2010-01-31 14:47:34 +0000 |
| commit | edd57359c8bfbc3ccd0f05a83b88d23da078d109 (patch) | |
| tree | c28ec1fd835b0eb63f4ffe796c4f53bb4db9150e /phpBB | |
| parent | 2906a24122535856f5a195264dc1d9a6836e0bcd (diff) | |
| download | forums-edd57359c8bfbc3ccd0f05a83b88d23da078d109.tar forums-edd57359c8bfbc3ccd0f05a83b88d23da078d109.tar.gz forums-edd57359c8bfbc3ccd0f05a83b88d23da078d109.tar.bz2 forums-edd57359c8bfbc3ccd0f05a83b88d23da078d109.tar.xz forums-edd57359c8bfbc3ccd0f05a83b88d23da078d109.zip | |
Hopefully nobody will notice me sneaking this one in:
Fix javascript bug in the smilies ACP. #55725
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10463 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_icons.html | 6 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 10166fec35..eedf39b440 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -139,9 +139,9 @@ <td><input class="text post" type="text" size="3" name="add_width" id="add_width" value="{WIDTH}" /></td> <td><input class="text post" type="text" size="3" name="add_height" id="add_height" value="{HEIGHT}" /></td> <td><input type="checkbox" class="radio" name="add_display_on_posting" checked="checked" onclick="toggle_select('add', this.checked, 'add_order');"/></td> - <td><select id="add_order" name="add_order"> - <optgroup id="order_disp[add]" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup> - <optgroup id="order_no_disp[add]" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup> + <td><select id="order_add_order" name="add_order"> + <optgroup id="order_disp_add_order" label="{L_DISPLAY_POSTING}">{S_ADD_ORDER_LIST_DISPLAY}</optgroup> + <optgroup id="order_no_disp_add_order" label="{L_DISPLAY_POSTING_NO}" disabled="disabled" class="disabled-options" >{S_ADD_ORDER_LIST_UNDISPLAY}</optgroup> </select></td> <td><input type="checkbox" class="radio" name="add_additional_code" value="1" /></td> </tr> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index efcb31bfe0..9f6b886932 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -152,6 +152,7 @@ <li>[Fix] Styles adjustment to correctly display an order of rtl/ltr mixed content. (Bugs #55485, #55545)</li> <li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li> <li>[Fix] Do not store email templates in database. (Bug #54505)</li> + <li>[Fix] Fix javascript bug in the smilies ACP. (Bug #55725)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> |