Correctly generate the doc link via go.php

diff --git a/core/js/config.php b/core/js/config.php
index f2bc24008dca03995f90c08607f0a5566fec4795..d6946f671d16cda8130aae786e8f7b9876097d33 100644 (file)
--- 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 295516544350b9c429395bccad8208bd6a8f8c02..56925417bfb0537136fad81c3239ca1ca10c4f52 100644 (file)
--- 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">';