diff options
| author | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
| commit | fe9851b94f1bfe4014cf48043b4609def611a3ee (patch) | |
| tree | 2362c48e0526f2254bb80a70db107b3032736a80 /lib/exe/ajax.php | |
| parent | 1614eb9180008daaf518e6271b82222219efc008 (diff) | |
| parent | 2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 (diff) | |
| download | rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.gz rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.bz2 | |
Merge remote branch 'upstream/master'
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) { |