summaryrefslogtreecommitdiffstats
path: root/lib/public
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-12-18 06:03:50 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-12-18 06:03:50 -0800
commit277ae281718febddd82846ebbdf7ec3c6380bc07 (patch)
treefeebe2d043f8b264397cde727709dfdbff9ee29d /lib/public
parenta90342b78117967388db462fec2dc7fd70edc0fa (diff)
parent335b2f40a631f7188ab921d69289acaf31908c6e (diff)
downloadnextcloud-server-277ae281718febddd82846ebbdf7ec3c6380bc07.tar.gz
nextcloud-server-277ae281718febddd82846ebbdf7ec3c6380bc07.zip
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
Fixed download file from URL error messages
Diffstat (limited to 'lib/public')
-rw-r--r--lib/public/json.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/public/json.php b/lib/public/json.php
index 134f724b0e6..831e3ef1cf6 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -169,4 +169,12 @@ class JSON {
public static function checkAdminUser() {
return(\OC_JSON::checkAdminUser());
}
+
+ /**
+ * Encode JSON
+ * @param array $data
+ */
+ public static function encode($data) {
+ return(\OC_JSON::encode($data));
+ }
}