diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-04-09 12:30:18 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-04-09 12:30:18 +0200 |
| commit | 6f51beac23c48384103457c26cda71a7c7f42fc1 (patch) | |
| tree | 4d500ac802909415bf01baff2d2c6613c90bf7f9 | |
| parent | 4a01d5c5883094f297c2c68628a8bac4a3b25586 (diff) | |
| download | nextcloud-server-6f51beac23c48384103457c26cda71a7c7f42fc1.tar.gz nextcloud-server-6f51beac23c48384103457c26cda71a7c7f42fc1.zip | |
Correctly generate the doc link via go.php
| -rw-r--r-- | core/js/config.php | 3 | ||||
| -rw-r--r-- | core/js/share.js | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/js/config.php b/core/js/config.php index f2bc24008dc..d6946f671d1 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -112,7 +112,8 @@ $array = array( 'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(), 'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(), 'resharingAllowed' => \OCP\Share::isResharingAllowed(), - 'remoteShareAllowed' => $outgoingServer2serverShareEnabled + 'remoteShareAllowed' => $outgoingServer2serverShareEnabled, + 'federatedCloudShareDoc' => \OC::$server->getURLGenerator()->linkToDocs('user-sharing-federated') ) ) ), diff --git a/core/js/share.js b/core/js/share.js index 29551654435..56925417bfb 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -399,9 +399,9 @@ OC.Share={ html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>'; html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />'; if(oc_appconfig.core.remoteShareAllowed) { - html += '<a target="_blank" class="icon-info svg shareWithRemoteInfo" ' - + 'title="'+t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')+'" ' - + 'href="https://doc.owncloud.org/server/8.0/user_manual/files/federated_cloud_sharing.html"></a>'; + var federatedCloudSharingDoc = '<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{docLink}" ' + + 'title="' + t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud') + '"></a>'; + html += federatedCloudSharingDoc.replace('{docLink}', oc_appconfig.core.federatedCloudShareDoc); } html += '<span class="shareWithLoading icon-loading-small hidden"></span>'; html += '<ul id="shareWithList">'; |