diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2008-08-15 01:29:47 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2008-08-15 01:29:47 +0200 |
| commit | 370e83bb0dfd0c70de268c93bf07ad5ee0897192 (patch) | |
| tree | 491674f4c242e4d6ba0d04eafa305174c35a3391 /includes/api/ApiFormatJson.php | |
| parent | f4debf0f12d0524d2b2427c55ea3f16b680fad97 (diff) | |
Update auf 1.13.0
Diffstat (limited to 'includes/api/ApiFormatJson.php')
| -rw-r--r-- | includes/api/ApiFormatJson.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php index 852a64b6..42156849 100644 --- a/includes/api/ApiFormatJson.php +++ b/includes/api/ApiFormatJson.php @@ -29,7 +29,7 @@ if (!defined('MEDIAWIKI')) { } /** - * @addtogroup API + * @ingroup API */ class ApiFormatJson extends ApiFormatBase { @@ -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 = ")"; } @@ -86,7 +86,6 @@ class ApiFormatJson extends ApiFormatBase { } public function getVersion() { - return __CLASS__ . ': $Id: ApiFormatJson.php 31484 2008-03-03 05:46:20Z brion $'; + return __CLASS__ . ': $Id: ApiFormatJson.php 35098 2008-05-20 17:13:28Z ialex $'; } } - |