summaryrefslogtreecommitdiffstats
path: root/lib/public/json.php
diff options
context:
space:
mode:
authorBrice Maron <brice@bmaron.net>2012-06-14 21:16:59 +0000
committerBrice Maron <brice@bmaron.net>2012-06-14 21:16:59 +0000
commit4753cc3ebde9867ab4deb1979fb4231b0c847426 (patch)
treec6944e947bc84c8716b57b7e2b06ef51efccb3db /lib/public/json.php
parent6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 (diff)
parentf3b30e4658c4dde82b56b458c672fa5edcba5d6b (diff)
downloadnextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.tar.gz
nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.zip
Merge branch 'master' into multi_app_dir
Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
Diffstat (limited to 'lib/public/json.php')
-rw-r--r--lib/public/json.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/public/json.php b/lib/public/json.php
index a8554671d10..b6edbd65bd5 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -53,6 +53,13 @@ class JSON {
return(\OC_JSON::checkLoggedIn());
}
+ /**
+ * @brief Check an ajax get/post call if the request token is valid.
+ * @return json Error msg if not valid.
+ */
+ public static function callCheck(){
+ return(\OC_JSON::callCheck());
+ }
/**
* @brief Send json success msg