diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-11 10:47:30 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-11 10:47:30 +0200 |
| commit | 55754939009a51da1ed8350d372d8d6f7e7768a5 (patch) | |
| tree | 2f2d951d0d02aabfc7352f16a466fd61e0750635 /apps/bookmarks | |
| parent | f875240b47823d28c5169b354ffe1a3e80aaf57e (diff) | |
| parent | 0f0aa1827f446ca531732bb1c807c244ef66676a (diff) | |
| download | nextcloud-server-55754939009a51da1ed8350d372d8d6f7e7768a5.tar.gz nextcloud-server-55754939009a51da1ed8350d372d8d6f7e7768a5.zip | |
Merge branch 'master' into calendar_import
Diffstat (limited to 'apps/bookmarks')
| -rw-r--r-- | apps/bookmarks/ajax/addBookmark.php | 2 | ||||
| -rw-r--r-- | apps/bookmarks/ajax/delBookmark.php | 2 | ||||
| -rw-r--r-- | apps/bookmarks/ajax/editBookmark.php | 2 | ||||
| -rw-r--r-- | apps/bookmarks/lib/bookmarks.php | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php index 6b5a0f71d4e..483716405a1 100644 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true; // Check if we are a user OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + OCP\JSON::checkAppEnabled('bookmarks'); require_once(OC_App::getAppPath('bookmarks').'/bookmarksHelper.php'); diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php index 5a067701c9f..f40f02ebab7 100644 --- a/apps/bookmarks/ajax/delBookmark.php +++ b/apps/bookmarks/ajax/delBookmark.php @@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true; // Check if we are a user OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + OCP\JSON::checkAppEnabled('bookmarks'); $id = $_POST['id']; diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php index 439b680dc20..0b37d161af1 100644 --- a/apps/bookmarks/ajax/editBookmark.php +++ b/apps/bookmarks/ajax/editBookmark.php @@ -28,6 +28,8 @@ $RUNTIME_NOSETUPFS=true; // Check if we are a user OCP\JSON::checkLoggedIn(); +OCP\JSON::callCheck(); + OCP\JSON::checkAppEnabled('bookmarks'); $CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" ); diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php index e0005968f31..86fba45a50c 100644 --- a/apps/bookmarks/lib/bookmarks.php +++ b/apps/bookmarks/lib/bookmarks.php @@ -145,5 +145,4 @@ class OC_Bookmarks_Bookmarks{ $result = $query->execute(); return true; } -} -?> +}
\ No newline at end of file |