summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-12-22 15:04:59 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2014-12-22 18:50:00 +0100
commit3afcc717640cfcde78c671ed536ab3b618b85f72 (patch)
tree2cdd2f23dd005f0af1e6e35764d310307a3f4f1a /apps/files_sharing/lib
parent393deb596182deec076cf1d9941eae4ba51f34d4 (diff)
downloadnextcloud-server-3afcc717640cfcde78c671ed536ab3b618b85f72.tar.gz
nextcloud-server-3afcc717640cfcde78c671ed536ab3b618b85f72.zip
Make sure the path passed to the activity manager is normalized
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r--apps/files_sharing/lib/controllers/sharecontroller.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 80f4b5ae364..8b04fbd0341 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -232,7 +232,7 @@ class ShareController extends Controller {
if (isset($originalSharePath) && Filesystem::isReadable($originalSharePath . $path)) {
$getPath = Filesystem::normalizePath($path);
- $originalSharePath .= $getPath;
+ $originalSharePath = Filesystem::normalizePath($originalSharePath . $getPath);
$type = \OC\Files\Filesystem::is_dir($originalSharePath) ? 'folder' : 'file';
$args = $type === 'folder' ? array('dir' => $originalSharePath) : array('dir' => dirname($originalSharePath), 'scrollto' => basename($originalSharePath));
$linkToFile = \OCP\Util::linkToAbsolute('files', 'index.php', $args);