From 618a3c1d94980ab6de8eadc0a491cd324cea2285 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Fri, 22 Jun 2012 12:22:19 -0400 Subject: [PATCH] Fix removing personal mounts --- apps/files_external/lib/config.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 870c13b5ae..5b9e00a378 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -157,12 +157,17 @@ class OC_Mount_Config { */ public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) { // Verify that the mount point applies for the current user - if ($isPersonal && $applicable != OCP\User::getUser()) { - return false; + if ($isPersonal) { + if ($applicable != OCP\User::getUser()) { + return false; + } + $mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/'); + } else { + $mountPoint = '/$user/files/'.ltrim($mountPoint, '/'); } $mountPoints = self::readData($isPersonal); // Remove mount point - unset($mountPoints[$mountType][$applicable]['/$user/files/'.$mountPoint]); + unset($mountPoints[$mountType][$applicable][$mountPoint]); // Unset parent arrays if empty if (empty($mountPoints[$mountType][$applicable])) { unset($mountPoints[$mountType][$applicable]);