diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 10:50:03 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 10:50:03 +0100 |
| commit | 560f6ea3cdac2767863c3be3a9e7933b6e37e88f (patch) | |
| tree | 6f51d4b3402458e4de1a596b93ec752c8ac747b2 /lib/exe/ajax.php | |
| parent | e0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a (diff) | |
| parent | c66c7229a0dfc4f9f06dadda98408679fa7a18d6 (diff) | |
| download | rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.gz rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.bz2 | |
Merge branch 'master' into bcrypt
Diffstat (limited to 'lib/exe/ajax.php')
| -rw-r--r-- | lib/exe/ajax.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index d4ef8dc11..f8d62cb57 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -281,7 +281,8 @@ function ajax_mediaupload(){ } $result = array('error' => $msg['msg'], 'ns' => $NS); } - echo htmlspecialchars(json_encode($result), ENT_NOQUOTES); + $json = new JSON; + echo htmlspecialchars($json->encode($result), ENT_NOQUOTES); } function dir_delete($path) { |