diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-08-07 18:23:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-08-07 18:23:46 +0200 |
| commit | f073f393335a225de285839f3c393976c71cf88c (patch) | |
| tree | 591f03056ef8a45226d5bd1ab4c45efac6e744a7 | |
| parent | 5402834ccf182ce3cd121621253451eeed3b49a9 (diff) | |
| parent | 8d8d54aac7d3f75e9b7d25f23c8bbe50de5220a3 (diff) | |
| download | forums-f073f393335a225de285839f3c393976c71cf88c.tar forums-f073f393335a225de285839f3c393976c71cf88c.tar.gz forums-f073f393335a225de285839f3c393976c71cf88c.tar.bz2 forums-f073f393335a225de285839f3c393976c71cf88c.tar.xz forums-f073f393335a225de285839f3c393976c71cf88c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12922] Subsilver2 fix
[ticket/12922] Posts per page in MCP should have a min value of zero
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_topic.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 6bf6af1b78..082bea22f1 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -34,7 +34,7 @@ <fieldset id="display-panel" class="fields2" role="tabpanel"> <dl> <dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt> - <dd><input class="inputbox autowidth" type="number" min="1" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd> + <dd><input class="inputbox autowidth" type="number" min="0" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd> </dl> <dl> <dt><label>{L_DISPLAY_POSTS}{L_COLON}</label></dt> diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index 5bd762ec0b..cba473147e 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -55,7 +55,7 @@ </tr> <tr> <td class="row1" nowrap="nowrap"><span class="gen">{L_POSTS_PER_PAGE}</span><br /><span class="gensmall">{L_POSTS_PER_PAGE_EXPLAIN}</span></td> - <td class="row2" colspan="2"><input class="post" type="number" min="1" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></td> + <td class="row2" colspan="2"><input class="post" type="number" min="0" name="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></td> </tr> <tr> <td class="cat" colspan="3" align="center"><span class="gensmall">{L_DISPLAY_POSTS}{L_COLON}</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td> |