diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-11-25 21:25:04 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-11-25 21:25:04 +0100 |
commit | 9fbccc83e3bdae664f7696da8d1902a516252830 (patch) | |
tree | a55ca135dd1e16a3c66ba9031dc3a4668c600e13 /lib/public/activity | |
parent | a609a5364779acb8ac27b337ad453dc9c8a39811 (diff) | |
parent | 844b4785f1e992391d51ef34eacc5cfda107ee50 (diff) | |
download | nextcloud-server-9fbccc83e3bdae664f7696da8d1902a516252830.tar.gz nextcloud-server-9fbccc83e3bdae664f7696da8d1902a516252830.zip |
merge master into single-user-mode
Diffstat (limited to 'lib/public/activity')
-rw-r--r-- | lib/public/activity/iconsumer.php | 5 | ||||
-rw-r--r-- | lib/public/activity/imanager.php | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/public/activity/iconsumer.php b/lib/public/activity/iconsumer.php index a0134a379dc..9afacf4e745 100644 --- a/lib/public/activity/iconsumer.php +++ b/lib/public/activity/iconsumer.php @@ -20,6 +20,11 @@ * */ +/** + * Public interface of ownCloud for apps to use. + * Activity/IConsumer interface + */ + // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes namespace OCP\Activity; diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php index 90215d637c0..086e430d677 100644 --- a/lib/public/activity/imanager.php +++ b/lib/public/activity/imanager.php @@ -20,6 +20,11 @@ * */ +/** + * Public interface of ownCloud for apps to use. + * Activity/IManager interface + */ + // use OCP namespace for all classes that are considered public. // This means that they should be used by apps instead of the internal ownCloud classes namespace OCP\Activity; @@ -47,7 +52,6 @@ interface IManager { * * $callable has to return an instance of OCA\Activity\IConsumer * - * @param string $key * @param \Closure $callable */ function registerConsumer(\Closure $callable); |