aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-08-21 21:19:12 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-08-21 21:19:12 +0200
commit7474b69175d08b78b1c96e3dad2c8c16315c6502 (patch)
tree5854f633bc78e28e8e1a2cf1f1b01feb91fe7f30
parent81db8a8644c8e0567ae1e9203e1f5a9cb042a098 (diff)
parent91a60aa878e703ff9af714e0316828216d3dcfa3 (diff)
downloadforums-7474b69175d08b78b1c96e3dad2c8c16315c6502.tar
forums-7474b69175d08b78b1c96e3dad2c8c16315c6502.tar.gz
forums-7474b69175d08b78b1c96e3dad2c8c16315c6502.tar.bz2
forums-7474b69175d08b78b1c96e3dad2c8c16315c6502.tar.xz
forums-7474b69175d08b78b1c96e3dad2c8c16315c6502.zip
Merge branch 'ticket/nickvergessen/7716' into develop-olympus
* ticket/nickvergessen/7716: [ticket/7716] Data too long for column 'message_subject'
-rw-r--r--phpBB/includes/functions_privmsgs.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index c4cbb7ca1e..ec05a2a555 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1316,6 +1316,10 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
// Recipient Information
$recipients = $to = $bcc = array();
+ // First of all make sure the subject are having the correct length.
+ // To achieve this without cutting off between special chars we convert to an array and then count the elements.
+ $subject = truncate_string($subject);
+
if ($mode != 'edit')
{
// Build Recipient List