summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-10 17:44:23 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-10 17:44:23 +0100
commitad61c552ea100d9118d2683940160484035f2e91 (patch)
tree6fc073754431aee6e62b95b0da07f2315de524f7
parentc8c9cd36dd5dba9b9fd6427cd3a5c1b85e308e3c (diff)
parent94915e39db3c7ca0a8fe493fb4d2039fdf49d818 (diff)
downloadnextcloud-server-ad61c552ea100d9118d2683940160484035f2e91.tar.gz
nextcloud-server-ad61c552ea100d9118d2683940160484035f2e91.zip
Merge pull request #23087 from owncloud/allow-migrating-all-calendars
Allow to migrate calendars of all users
-rw-r--r--apps/dav/command/migratecalendars.php4
-rw-r--r--apps/dav/command/syncbirthdaycalendar.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/dav/command/migratecalendars.php b/apps/dav/command/migratecalendars.php
index 5e7f6e9b697..d887309ac3e 100644
--- a/apps/dav/command/migratecalendars.php
+++ b/apps/dav/command/migratecalendars.php
@@ -61,8 +61,8 @@ class MigrateCalendars extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
$this->service->setup();
- if ($input->hasArgument('user')) {
- $user = $input->getArgument('user');
+ $user = $input->getArgument('user');
+ if (!is_null($user)) {
if (!$this->userManager->userExists($user)) {
throw new \InvalidArgumentException("User <$user> in unknown.");
}
diff --git a/apps/dav/command/syncbirthdaycalendar.php b/apps/dav/command/syncbirthdaycalendar.php
index 5a2baa31d93..90a73a3eeb3 100644
--- a/apps/dav/command/syncbirthdaycalendar.php
+++ b/apps/dav/command/syncbirthdaycalendar.php
@@ -61,8 +61,8 @@ class SyncBirthdayCalendar extends Command {
* @param OutputInterface $output
*/
protected function execute(InputInterface $input, OutputInterface $output) {
- if ($input->getArgument('user') !== null) {
- $user = $input->getArgument('user');
+ $user = $input->getArgument('user');
+ if (!is_null($user)) {
if (!$this->userManager->userExists($user)) {
throw new \InvalidArgumentException("User <$user> in unknown.");
}