dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* addresses https://bugs.launchpad.net/firefogg/+bug/456384
[lhc/web/wiklou.git]
/
js2
/
mwEmbed
/
php
/
maintenance
/
mergeJavascriptMsg.php
diff --git
a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
index
c126fc8
..
a9c99f1
100644
(file)
--- a/
js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
+++ b/
js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
@@
-142,7
+142,7
@@
function doJsonMerge( $json_txt ) {
}
// merge the jsLanguage array back in and wrap the output
if ( $mergeToJS && $doReplaceFlag ) {
}
// merge the jsLanguage array back in and wrap the output
if ( $mergeToJS && $doReplaceFlag ) {
- $json =
FormatJson::
encode( $jsMsgAry );
+ $json =
json_
encode( $jsMsgAry );
$json_txt = jsonReadable( $json );
// escape $1 for preg replace:
$json_txt = str_replace( '$', '\$', $json_txt );
$json_txt = jsonReadable( $json );
// escape $1 for preg replace:
$json_txt = str_replace( '$', '\$', $json_txt );