Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
e918bcf2
Commit
e918bcf2
authored
Mar 27, 2015
by
Morris Jobke
Browse files
Merge pull request #15247 from owncloud/fix_group_share_master_backport
also call generateTarget for group shares
parents
0ecc1c89
223cca2a
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/private/share/share.php
View file @
e918bcf2
...
...
@@ -1825,9 +1825,10 @@ class Share extends \OC\Share\Constants {
if
(
in_array
(
\
OCP\User
::
getUser
(),
$users
))
{
unset
(
$users
[
array_search
(
\
OCP\User
::
getUser
(),
$users
)]);
}
$groupItemTarget
=
Helper
::
generateTarget
(
$itemType
,
$itemSource
,
$shareType
,
$shareWith
[
'group'
],
$uidOwner
,
$suggestedItemTarget
);
$groupFileTarget
=
$filePath
;
$groupItemTarget
=
Helper
::
generateTarget
(
$itemType
,
$itemSource
,
$shareType
,
$shareWith
[
'group'
],
$uidOwner
,
$suggestedItemTarget
);
$groupFileTarget
=
Helper
::
generateTarget
(
$itemType
,
$itemSource
,
$shareType
,
$shareWith
[
'group'
],
$uidOwner
,
$filePath
);
// add group share to table and remember the id as parent
$queriesToExecute
[
'groupShare'
]
=
array
(
...
...
@@ -1840,7 +1841,7 @@ class Share extends \OC\Share\Constants {
'permissions'
=>
$permissions
,
'shareTime'
=>
time
(),
'fileSource'
=>
$fileSource
,
'fileTarget'
=>
$
filePath
,
'fileTarget'
=>
$
groupFileTarget
,
'token'
=>
$token
,
'parent'
=>
$parent
,
'expiration'
=>
$expirationDate
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment