Merge pull request #10301 from owncloud/fix-internal-mail-share-links

Don't use /Shared as a base for links in share email

1 files changed, 10 insertions, 5 deletions

diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index cb74dcf8b90..1f4645eed9f 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -99,15 +99,20 @@ class MailNotifications {
 				}
 			}
 
+			// Link to folder, or root folder if a file
+
 			if ($itemType === 'folder') {
-				$foldername = "/Shared/" . $filename;
+				$args = array(
+					'dir' => $filename,
+				);
 			} else {
-				// if it is a file we can just link to the Shared folder,
-				// that's the place where the user will find the file
-				$foldername = "/Shared";
+				$args = array(
+					'dir' => '/',
+					'scrollto' => $filename,
+				);
 			}
 
-			$link = \OCP\Util::linkToAbsolute('files', 'index.php', array("dir" => $foldername));
+			$link = \OCP\Util::linkToAbsolute('files', 'index.php', $args);
 
 			list($htmlMail, $alttextMail) = $this->createMailBody($filename, $link, $expiration);