aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-07-31 02:11:33 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-31 02:11:33 +0200
commite1328e87ce23245dbd55a08fbaf3d48e957a6777 (patch)
treec5aa7746eef8870a3e0e3375af6d76e16e43c300 /phpBB/includes
parentf179987f6468c6ded301bbb95871d1591b00b98f (diff)
parent15d7010d4605a5f8d0082299a904ed54ad002618 (diff)
downloadforums-e1328e87ce23245dbd55a08fbaf3d48e957a6777.tar
forums-e1328e87ce23245dbd55a08fbaf3d48e957a6777.tar.gz
forums-e1328e87ce23245dbd55a08fbaf3d48e957a6777.tar.bz2
forums-e1328e87ce23245dbd55a08fbaf3d48e957a6777.tar.xz
forums-e1328e87ce23245dbd55a08fbaf3d48e957a6777.zip
Merge branch 'ticket/jellydoughnut/9757' into develop-olympus
* ticket/jellydoughnut/9757: [ticket/9757] Fix empty template variable {HISTORY_TITLE}
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_privmsgs.php4
1 files changed, 2 insertions, 2 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') . '&amp;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;