diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-07-29 13:19:19 -0500 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-07-29 13:19:19 -0500 |
| commit | 15d7010d4605a5f8d0082299a904ed54ad002618 (patch) | |
| tree | 1786a45556981c48424b767fd2384570cdd9d409 /phpBB | |
| parent | fc25fe694afdab683789c9ed962c77558f85796c (diff) | |
| download | forums-15d7010d4605a5f8d0082299a904ed54ad002618.tar forums-15d7010d4605a5f8d0082299a904ed54ad002618.tar.gz forums-15d7010d4605a5f8d0082299a904ed54ad002618.tar.bz2 forums-15d7010d4605a5f8d0082299a904ed54ad002618.tar.xz forums-15d7010d4605a5f8d0082299a904ed54ad002618.zip | |
[ticket/9757] Fix empty template variable {HISTORY_TITLE}
The template variable {HISTORY_TITLE} was always being set to the empty string.
It is now filled with the title of the currently displayed message. It is not
showed in prosilver or subsilver2 for aesthetic reasons (title is already
prominent)
PHPBB3-9757
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_history.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_history.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 4fc5034f7b..c4cbb7ca1e 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1751,6 +1751,8 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode return false; } + $title = $row['message_subject']; + $rowset = array(); $bbcode_bitfield = ''; $folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder='; @@ -1774,8 +1776,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode while ($row = $db->sql_fetchrow($result)); $db->sql_freeresult($result); - $title = $row['message_subject']; - if (sizeof($rowset) == 1 && !$in_post_mode) { return false; diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index c555e90640..9051eb2ee0 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,7 +1,7 @@ <h3 id="review"> <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> - {L_MESSAGE_HISTORY}: {HISTORY_TITLE} + {L_MESSAGE_HISTORY}: </h3> <div id="topicreview"> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index 53391b30c9..8754acaaa2 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -6,7 +6,7 @@ <table class="tablebg" width="100%" cellspacing="1"> <tr> - <th align="center">{L_MESSAGE_HISTORY} - {HISTORY_TITLE}</th> + <th align="center">{L_MESSAGE_HISTORY}</th> </tr> <tr> <td class="row1"><div style="overflow: auto; width: 100%; height: 300px;"> |