aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-11-10 16:19:24 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-11-10 16:19:24 +0000
commitfe57a7983b692de98150a163f8615a21f5efe24d (patch)
tree93376a24aeb5dfd7e629b290d6fd95a3a4f437dd
parent8c26e780e3945509d7d27419c955870faf84d405 (diff)
downloadforums-fe57a7983b692de98150a163f8615a21f5efe24d.tar
forums-fe57a7983b692de98150a163f8615a21f5efe24d.tar.gz
forums-fe57a7983b692de98150a163f8615a21f5efe24d.tar.bz2
forums-fe57a7983b692de98150a163f8615a21f5efe24d.tar.xz
forums-fe57a7983b692de98150a163f8615a21f5efe24d.zip
fixing tiny bugs
git-svn-id: file:///svn/phpbb/trunk@8232 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/adm/style/acp_users_signature.html2
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_messenger.php2
-rw-r--r--phpBB/styles/subsilver2/template/memberlist_search.html2
4 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
index a6664a40e4..239d35f119 100644
--- a/phpBB/adm/style/acp_users_signature.html
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -77,7 +77,7 @@
<!-- IF .custom_tags -->
<br /><br />
<!-- BEGIN custom_tags -->
- <input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')"<!-- ENDIF --> />
+ <input type="button" class="button2" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
<!-- END custom_tags -->
<!-- ENDIF -->
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index afe468b28b..72b94a97b9 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -98,6 +98,7 @@
<li>[Fix] Allow charset names containing underscores or spaces</li>
<li>[Fix] Don't allow previous/next links for non-existing topics (Bug #15039)</li>
<li>[Change] Do not assign converted votes to the first option in a vote.</li>
+ <li>[Fix] Use correct RFC 2822 date format in emails (Bug #15042)</li>
</ul>
<a name="v30rc6"></a><h3>1.ii. Changes since 3.0.RC6</h3>
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 6bce44209a..8d690bea64 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -327,7 +327,7 @@ class messenger
$headers[] = 'Sender: <' . $config['board_email'] . '>';
$headers[] = 'MIME-Version: 1.0';
$headers[] = 'Message-ID: <' . md5(unique_id(time())) . '@' . $config['server_name'] . '>';
- $headers[] = 'Date: ' . gmdate('D, d M Y H:i:s T', time());
+ $headers[] = 'Date: ' . date('r', time());
$headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed
$headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index f718c568ca..fff71a90d6 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -130,7 +130,7 @@
</tr>
<!-- ENDIF -->
<tr>
- <td class="cat" colspan="4" align="center"><input class="btnlite" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
+ <td class="cat" colspan="4" align="center"><input class="btnmain" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
</tr>
</table>
{S_FORM_TOKEN}