diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-02-18 01:31:06 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-02-18 01:31:06 +0000 |
| commit | b68d23347a03ff0f7b3fe9dbdddd93675f812776 (patch) | |
| tree | d7b897df20703410289ac4408bb8ab9897e72f31 | |
| parent | 0ddc3703869733546e836f68761d1f42498386b4 (diff) | |
| download | forums-b68d23347a03ff0f7b3fe9dbdddd93675f812776.tar forums-b68d23347a03ff0f7b3fe9dbdddd93675f812776.tar.gz forums-b68d23347a03ff0f7b3fe9dbdddd93675f812776.tar.bz2 forums-b68d23347a03ff0f7b3fe9dbdddd93675f812776.tar.xz forums-b68d23347a03ff0f7b3fe9dbdddd93675f812776.zip | |
Merge r10488 into 3.0.7 branch. #57505
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10501 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_logs.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_notes_user.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2e2b228771..77951b77df 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -98,7 +98,7 @@ <li>[Fix] Do not link to user profile in ATOM feed entry if post has been made by the guest user. (Bug #54275)</li> <li>[Fix] Make word censoring case insensitive. (Bug #54265)</li> <li>[Fix] Fulltext-MySQL search for keywords and username at the same time. (Bug #54325)</li> - <li>[Fix] Various XHTML and CSS mistakes in prosilver. (Bugs #54705, #55895)</li> + <li>[Fix] Various XHTML and CSS mistakes in prosilver and subsilver2. (Bugs #54705, #55895, #57505)</li> <li>[Fix] Correctly show topic ATOM feed link when only post id is specified. (Bug #53025)</li> <li>[Fix] Cleanly handle forum/topic not found in ATOM Feeds. (Bug #54295)</li> <li>[Fix] PHP 5.3 compatibility: Check if function dl() exists before calling it. (Bug #54665)</li> diff --git a/phpBB/styles/subsilver2/template/mcp_logs.html b/phpBB/styles/subsilver2/template/mcp_logs.html index 6b78df3e5e..8b69197b0f 100644 --- a/phpBB/styles/subsilver2/template/mcp_logs.html +++ b/phpBB/styles/subsilver2/template/mcp_logs.html @@ -22,7 +22,7 @@ </tr> <!-- END log --> <tr align="center"> - <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /></td> + <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td> </tr> <tr align="center"> <td class="row3" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->"><span class="gensmall">{L_DISPLAY_LOG}:</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" value="{L_GO}" name="sort" /></td> diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html index 522c19fa05..4ee3f9e04e 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_user.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_user.html @@ -55,7 +55,7 @@ <!-- IF S_USER_NOTES --> <tr align="center"> - <td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" /></td> + <td colspan="5" class="row3"><span class="gensmall">{L_SEARCH_KEYWORDS}:</span> <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="btnlite" name="filter" value="{L_SEARCH}" /></td> </tr> <tr align="center"> <td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</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" value="{L_GO}" name="sort" /></td> |