From: Petr Skoda Date: Fri, 19 Aug 2011 16:42:49 +0000 (+0200) Subject: MDL-28936 fix invalid >200 comparison and utf-8 incompatibility X-Git-Tag: v2.2.0-beta~513^2 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=0b92cdce1f73f684ab44a551ef879a62a190dbf7;hp=4f3632441a239b039669402446d5afc1fca3313a;ds=sidebyside MDL-28936 fix invalid >200 comparison and utf-8 incompatibility Credit for discovery goes to Jason Ilicic. --- diff --git a/lib/moodlelib.php b/lib/moodlelib.php index e797bf67fed..61a85a5c323 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -9368,9 +9368,10 @@ WHERE m.useridto = :userid AND p.name='popup'"; $smallmessage = null; if (!empty($message_users->smallmessage)) { //display the first 200 chars of the message in the popup + $textlib = textlib_get_instance(); $smallmessage = null; - if (strlen($message_users->smallmessage>200)) { - $smallmessage = substr($message_users->smallmessage,0,200).'...'; + if ($textlib->strlen($message_users->smallmessage) > 200) { + $smallmessage = $textlib->substr($message_users->smallmessage,0,200).'...'; } else { $smallmessage = $message_users->smallmessage; }