(bug 12136) Extend allowed characters in JSON callback to ][.'"_A-Za-z0-9

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 35e1334..3684ffb 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -193,6 +193,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13606) Added archivename to iiprop
 * (bug 11633) Explicitly convert redirect titles to strings due to PHP's
   very weak typing on array keys.
+* (bug 12136) Extend allowed characters in JSON callback to ][.'"_A-Za-z0-9
 
 === Languages updated in 1.13 ===
 

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 22ca658..32d29ed 100644 (file)
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -54,7 +54,7 @@ class ApiFormatJson extends ApiFormatBase {
                $params = $this->extractRequestParams();
                $callback = $params['callback'];
                if(!is_null($callback)) {
-                       $prefix = ereg_replace("[^_A-Za-z0-9]", "", $callback ) . "(";
+                       $prefix = preg_replace("/[^][.\\'\\\"_A-Za-z0-9]/", "", $callback ) . "(";
                        $suffix = ")";
                }