diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-06-08 10:17:08 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-06-08 10:17:08 +0000 |
| commit | 27d4c7229d97ba25e5bd303b21f376e14550eba6 (patch) | |
| tree | fffc0d09af18e3aed136e25f236a94a5236b2c4c | |
| parent | a3c5562a0d8674c0a513d25855b082c726b26f5b (diff) | |
| download | forums-27d4c7229d97ba25e5bd303b21f376e14550eba6.tar forums-27d4c7229d97ba25e5bd303b21f376e14550eba6.tar.gz forums-27d4c7229d97ba25e5bd303b21f376e14550eba6.tar.bz2 forums-27d4c7229d97ba25e5bd303b21f376e14550eba6.tar.xz forums-27d4c7229d97ba25e5bd303b21f376e14550eba6.zip | |
Fix bug #34295 - Move post bump information markup to the template.
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9563 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/viewtopic_body.html | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6a456b3b94..59ae95d0b4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -94,6 +94,7 @@ <li>[Fix] Show report button in prosilver for guests who are allowed to report posts. (Bug #45695 - Patch by bantu)</li> <li>[Fix] Correctly show private message history (Bug #46065 - Patch by bantu) <li>[Fix] Various XHTML mistakes in prosilver and subsilver2. (Bugs #38555, #45505 - Patch by Raimon, #45785, #45865)</li> + <li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Feature] Backported 3.2 captcha plugins.</li> <li>[Feature] Introduced new ACM plugins: diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index de59578c6b..9dd80a6896 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -163,7 +163,7 @@ </div> <!-- ENDIF --> - <!-- IF postrow.BUMPED_MESSAGE --><div class="notice">{postrow.BUMPED_MESSAGE}</div><!-- ENDIF --> + <!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF --> <!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html index f243c37371..43611daf76 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ b/phpBB/styles/subsilver2/template/viewtopic_body.html @@ -259,7 +259,7 @@ <!-- ENDIF --> <!-- IF postrow.BUMPED_MESSAGE --> - <span class="gensmall">{postrow.BUMPED_MESSAGE}</span> + <span class="gensmall"><br /><br />{postrow.BUMPED_MESSAGE}</span> <!-- ENDIF --> <!-- IF not postrow.S_HAS_ATTACHMENTS --><br clear="all" /><br /><!-- ENDIF --> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index e0584f3dc3..5af6516095 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1395,7 +1395,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // It is safe to grab the username from the user cache array, we are at the last // post and only the topic poster and last poster are allowed to bump. // Admins and mods are bound to the above rules too... - $l_bumped_by = '<br /><br />' . sprintf($user->lang['BUMPED_BY'], $user_cache[$topic_data['topic_bumper']]['username'], $user->format_date($topic_data['topic_last_post_time'], false, true)); + $l_bumped_by = sprintf($user->lang['BUMPED_BY'], $user_cache[$topic_data['topic_bumper']]['username'], $user->format_date($topic_data['topic_last_post_time'], false, true)); } else { |