diff options
| author | Dominik Eckelmann <deckelmann@gmail.com> | 2011-11-19 14:44:48 +0100 |
|---|---|---|
| committer | Dominik Eckelmann <deckelmann@gmail.com> | 2011-11-19 14:44:48 +0100 |
| commit | 402e0951b7e3ccf567702515bfe0b09cca8a5a93 (patch) | |
| tree | b5c4526d2d7ca1482fe8a67aa12125b065c478be /lib/exe/ajax.php | |
| parent | 5446f3ffde77013d4eaea1fb166bcbd905a777a4 (diff) | |
| parent | 1017f6f159386699a10d2529c50fb5e28b5c1889 (diff) | |
| download | rpg-402e0951b7e3ccf567702515bfe0b09cca8a5a93.tar.gz rpg-402e0951b7e3ccf567702515bfe0b09cca8a5a93.tar.bz2 | |
Merge branch 'master' of github.com:dom-mel/dokuwiki
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) { |