diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:26:06 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:26:06 -0400 |
| commit | 02dc34320978bfbcb30dea34b87808837586bb65 (patch) | |
| tree | d0ec46f342edc049ea35deacd29bc9d2741fe5ca | |
| parent | 854eaff34f8430cb94846903e2fe3eefb9703b1d (diff) | |
| download | nextcloud-server-02dc34320978bfbcb30dea34b87808837586bb65.tar.gz nextcloud-server-02dc34320978bfbcb30dea34b87808837586bb65.zip | |
fix address of public shared calendars
| -rw-r--r-- | apps/calendar/js/calendar.js | 2 | ||||
| -rw-r--r-- | apps/calendar/templates/share.dropdown.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index d25242fe63a..84829695eee 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -515,7 +515,7 @@ Calendar={ share:function(id, idtype, sharewith, sharetype){ $.getJSON(OC.filePath('calendar', 'ajax/share', 'share.php'),{id:id, idtype:idtype, sharewith:sharewith, sharetype:sharetype}, function(data){ if(sharetype == 'public'){ - $('#public_token').val(OC.linkTo('calendar', 'share.php?t=' + data.message)); + $('#public_token').val(window.location.protocol + '//' + location.host + OC.linkTo('calendar', 'share.php?t=' + data.message)); $('#public_token').css('display', 'block'); } }); diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php index 4e9f41ead14..8e3baa77248 100644 --- a/apps/calendar/templates/share.dropdown.php +++ b/apps/calendar/templates/share.dropdown.php @@ -73,5 +73,5 @@ echo html_select_options($allgroups, array()); </ul> <div id="public"> <input type="checkbox" id="publish" <?php echo ($public['share'])?'checked="checked"':'' ?>><label for="publish"><?php echo $l->t('make public'); ?></label><br> - <input type="text" id="public_token" value="<?php echo OC_Helper::linkTo('calendar', 'share.php?t=' . $public['share'], null, true) ; ?>" onmouseover="$('#public_token').select();" style="<?php echo (!$public['share'])?'display:none':'' ?>"> + <input type="text" id="public_token" value="<?php echo OC_Helper::linkToAbsolute('calendar', 'share.php?t=' . $public['share'], null, true) ; ?>" onmouseover="$('#public_token').select();" style="<?php echo (!$public['share'])?'display:none':'' ?>"> </div>
\ No newline at end of file |