When putting usernames in SQL comments, truncate using mb_ functions for utf username...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2fa17f3..c2230b6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -358,6 +358,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12880) wfLoadExtensionMessages does not use $fallback from MessagesXx.php
 * (bug 12885) Correction for Russian convertPlural function
 * (bug 12768) Make DatabasePostgres->hasContraint() schema aware.
+* (bug 12735) Truncate usernames in comments using mb_ functions.
 
 == Parser changes in 1.12 ==
 

diff --git a/includes/Database.php b/includes/Database.php
index 0548b7c..6966430 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -745,8 +745,8 @@ class Database {
                        global $wgUser;
                        if ( is_object( $wgUser ) && !($wgUser instanceof StubObject) ) {
                                $userName = $wgUser->getName();
-                               if ( strlen( $userName ) > 15 ) {
-                                       $userName = substr( $userName, 0, 15 ) . '...';
+                               if ( mb_strlen( $userName ) > 15 ) {
+                                       $userName = mb_substr( $userName, 0, 15 ) . '...';
                                }
                                $userName = str_replace( '/', '', $userName );
                        } else {