aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2015-05-28 11:17:20 +0200
committerCesar G <prototech91@gmail.com>2015-05-28 11:17:20 +0200
commit30d39687de77c6f07b97e1b5d187314942d39dc5 (patch)
tree951a7417b8b7da78ca61c19695ba9ccad25b692b
parentc5b2822cf50188cb65f973fb4c2d1315f47d25b2 (diff)
parent080690073aa63ec484bc5d553e412b0f8325feb1 (diff)
downloadforums-30d39687de77c6f07b97e1b5d187314942d39dc5.tar
forums-30d39687de77c6f07b97e1b5d187314942d39dc5.tar.gz
forums-30d39687de77c6f07b97e1b5d187314942d39dc5.tar.bz2
forums-30d39687de77c6f07b97e1b5d187314942d39dc5.tar.xz
forums-30d39687de77c6f07b97e1b5d187314942d39dc5.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
-rw-r--r--phpBB/styles/prosilver/template/posting_poll_body.html21
1 files changed, 8 insertions, 13 deletions
diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html
index c3eea0d21d..dcaec14a93 100644
--- a/phpBB/styles/prosilver/template/posting_poll_body.html
+++ b/phpBB/styles/prosilver/template/posting_poll_body.html
@@ -6,13 +6,14 @@
<!-- ENDIF -->
<fieldset class="fields2">
+ <!-- IF S_POLL_DELETE -->
+ <dl>
+ <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
+ <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
+ </dl>
+ <!-- ENDIF -->
+
<!-- IF S_SHOW_POLL_BOX -->
- <!-- IF S_POLL_DELETE -->
- <dl>
- <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
- <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
- </dl>
- <!-- ENDIF -->
<dl>
<dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt>
<dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd>
@@ -44,14 +45,8 @@
</dl>
<!-- ENDIF -->
<!-- ENDIF -->
- <!-- EVENT posting_poll_body_options_after -->
- <!-- IF S_POLL_DELETE -->
- <dl class="fields1">
- <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt>
- <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd>
- </dl>
- <!-- ENDIF -->
+ <!-- EVENT posting_poll_body_options_after -->
</fieldset>
</div>