diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
| commit | 6eb194b70284d527a182756f2c7a21f3d7dc1fe8 (patch) | |
| tree | e70635e44cc4fccbbde34bed1a01fd50fcd183cf /lib/public/api.php | |
| parent | 218a5ea89014322592bd8c4789d8500d42029b9f (diff) | |
| parent | 329bddab481129b480ca187b694e507eff7fb125 (diff) | |
| download | nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.tar.gz nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.zip | |
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
Diffstat (limited to 'lib/public/api.php')
| -rw-r--r-- | lib/public/api.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/public/api.php b/lib/public/api.php index 9d6d1153e6c..a85daa1935c 100644 --- a/lib/public/api.php +++ b/lib/public/api.php @@ -28,17 +28,17 @@ namespace OCP; class API { /** - * registers an api call - * @param string $method the http method - * @param string $url the url to match - * @param callable $action the function to run - * @param string $app the id of the app registering the call - * @param int $authlevel the level of authentication required for the call (See OC_API constants) - * @param array $defaults - * @param array $requirements - */ - public static function register($method, $url, $action, $app, $authlevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){ - \OC_API::register($method, $url, $action, $app, $authlevel, $defaults, $requirements); + * registers an api call + * @param string $method the http method + * @param string $url the url to match + * @param callable $action the function to run + * @param string $app the id of the app registering the call + * @param int $authLevel the level of authentication required for the call (See OC_API constants) + * @param array $defaults + * @param array $requirements + */ + public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){ + \OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements); } } |