diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-09 13:24:43 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-09 13:24:43 -0600 |
| commit | 357a4facf6a5b026c507b54dc8c35b20207e80e0 (patch) | |
| tree | ab66915bf0bd5afa84eff7899d88b17c5581cbd2 /phpBB/styles/prosilver/template | |
| parent | 37565f37e4363f257a160145bc7973a2d5738a86 (diff) | |
| parent | 3fe381eed561e724700b21789e28ea3efb1f7ef9 (diff) | |
| download | forums-357a4facf6a5b026c507b54dc8c35b20207e80e0.tar forums-357a4facf6a5b026c507b54dc8c35b20207e80e0.tar.gz forums-357a4facf6a5b026c507b54dc8c35b20207e80e0.tar.bz2 forums-357a4facf6a5b026c507b54dc8c35b20207e80e0.tar.xz forums-357a4facf6a5b026c507b54dc8c35b20207e80e0.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/jumpbox.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index ff234464dc..dd793fbadc 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -10,13 +10,14 @@ <!-- ENDIF --> <!-- IF S_DISPLAY_JUMPBOX --> - <form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.f.value == -1){return false;}"> + <form method="get" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.f.value == -1){return false;}"> <!-- IF $CUSTOM_FIELDSET_CLASS --> <fieldset class="{$CUSTOM_FIELDSET_CLASS}"> <!-- ELSE --> <fieldset class="jumpbox"> <!-- ENDIF --> + {HIDDEN_FIELDS_FOR_JUMPBOX} <label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</label> <select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }"> <!-- BEGIN jumpbox_forums --> |