diff options
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 4 | ||||
| -rw-r--r-- | core/js/share.js | 2 | ||||
| -rw-r--r-- | lib/private/db/mdb2schemamanager.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 35574b8e5b9..f142f525cfa 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -318,8 +318,8 @@ class Hooks { // get the parent from current share
$parent = $util->getShareParent($params['parent']);
- // if parent is file the it is an 1:1 share
- if ($parent['item_type'] === 'file') {
+ // if parent has the same type than the child it is a 1:1 share
+ if ($parent['item_type'] === $params['itemType']) {
// prefix path with Shared
$path = '/Shared' . $parent['file_target'];
diff --git a/core/js/share.js b/core/js/share.js index e2911ae2ff3..10ab5f47f27 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -461,7 +461,7 @@ OC.Share={ if (password != null) { $('#linkPass').show('blind'); $('#showPassword').attr('checked', true); - $('#linkPassText').attr('placeholder', t('core', 'Password protected')); + $('#linkPassText').attr('placeholder', '**********'); } $('#expiration').show(); $('#emailPrivateLink #email').show(); diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index 416e2f55426..6378c769055 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -19,6 +19,8 @@ class MDB2SchemaManager { */ public function __construct($conn) { $this->conn = $conn; + $this->conn->close(); + $this->conn->connect(); } /** |