(bug 16899) DISPLAYTITLE should allow Arabic and Persian harakats

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2f95a43..3baf787 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -221,6 +221,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17621) Special:WantedFiles has no link to Special:Whatlinkshere
 * (bug 17460) Client ecoding is now correctly set for PostgreSQL
 * (bug 17648) Prevent floats from intruding into edit area in previews if no toolbar present
+* (bug 16899) DISPLAYTITLE should allow Arabic and Persian harakats
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/includes/Title.php b/includes/Title.php
index 888c47a..c5d1e38 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2197,6 +2197,9 @@ class Title {
                #
                $dbkey = preg_replace( '/[ _]+/', '_', $dbkey );
                $dbkey = trim( $dbkey, '_' );
+               
+               # Clean up Arabic harakats (bug 16899)
+               $dbkey = preg_replace( '/[\x{064B}-\x{0652}]/Su', '', $dbkey );
 
                if ( '' == $dbkey ) {
                        return false;