mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 07:35:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/jellydoughnut/9757' into develop-olympus

Browse Source 
* ticket/jellydoughnut/9757:
  [ticket/9757] Fix empty template variable {HISTORY_TITLE}
This commit is contained in:
Andreas Fischer 2010-07-31 02:11:33 +02:00
commit e1328e87ce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions_privmsgs.php
View File

@ -1751,6 +1751,8 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
return false; return false;
} }
$title = $row['message_subject'];
$rowset = array(); $rowset = array();
$bbcode_bitfield = ''; $bbcode_bitfield = '';
$folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder='; $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)); while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result); $db->sql_freeresult($result);
$title = $row['message_subject'];
if (sizeof($rowset) == 1 && !$in_post_mode) if (sizeof($rowset) == 1 && !$in_post_mode)
{ {
return false; return false;

2
phpBB/styles/prosilver/template/ucp_pm_history.html
View File

@ -1,7 +1,7 @@
<h3 id="review"> <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> <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> </h3>
<div id="topicreview"> <div id="topicreview">

2
phpBB/styles/subsilver2/template/ucp_pm_history.html
View File

@ -6,7 +6,7 @@
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<th align="center">{L_MESSAGE_HISTORY} - {HISTORY_TITLE}</th> <th align="center">{L_MESSAGE_HISTORY}</th>
</tr> </tr>
<tr> <tr>
<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;"> <td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">