aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-08-21 21:27:07 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-08-21 21:27:07 +0200
commit9731f2492f329a35b80483fa7573763b728c4f40 (patch)
tree9cef666b6bb2ec24b3585f0cc8e3a1ee72fdde61
parent32bffe1a3219b7360fbace7f8f8596b38dfcccf6 (diff)
parent2455a744e67dc2d0bbdf699af2d699b94aed3ad6 (diff)
downloadforums-9731f2492f329a35b80483fa7573763b728c4f40.tar
forums-9731f2492f329a35b80483fa7573763b728c4f40.tar.gz
forums-9731f2492f329a35b80483fa7573763b728c4f40.tar.bz2
forums-9731f2492f329a35b80483fa7573763b728c4f40.tar.xz
forums-9731f2492f329a35b80483fa7573763b728c4f40.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.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index c4cbb7ca1e..4c34bc92ca 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1380,6 +1380,9 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
}
}
+ // First of all make sure the subject are having the correct length.
+ $subject = truncate_string($subject);
+
$db->sql_transaction('begin');
$sql = '';