diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-08 11:21:55 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-08 11:21:55 +0200 |
| commit | 65cd15ca1505fd7acf4dd7b7e66702adc20e3a3d (patch) | |
| tree | b1ff475e387e1e9d533278c7464331ae12d2fd13 /apps/calendar/ajax | |
| parent | 2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c (diff) | |
| parent | 4768510923f6bfa3f3473874395a7a61872f1df0 (diff) | |
| download | nextcloud-server-65cd15ca1505fd7acf4dd7b7e66702adc20e3a3d.tar.gz nextcloud-server-65cd15ca1505fd7acf4dd7b7e66702adc20e3a3d.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/ajax')
| -rw-r--r-- | apps/calendar/ajax/share/share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php index 3ce2bf1e217..629a7b6b79f 100644 --- a/apps/calendar/ajax/share/share.php +++ b/apps/calendar/ajax/share/share.php @@ -13,7 +13,7 @@ switch($idtype){ case 'event': break; default: - OCP\JSON::error(array('message'=>'unexspected parameter')); + OCP\JSON::error(array('message'=>'unexpected parameter')); exit; } if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){ @@ -32,7 +32,7 @@ switch($sharetype){ case 'public': break; default: - OCP\JSON::error(array('message'=>'unexspected parameter')); + OCP\JSON::error(array('message'=>'unexpected parameter')); exit; } if($sharetype == 'user' && !OCP\User::userExists($sharewith)){ @@ -44,7 +44,7 @@ if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){ exit; } if($sharetype == 'user' && OCP\USER::getUser() == $sharewith){ - OCP\JSON::error(array('meesage'=>'you can not share with yourself')); + OCP\JSON::error(array('message'=>'you can not share with yourself')); } $success = OC_Calendar_Share::share(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT)); if($success){ |