upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge branch 'master' of github.com:owncloud/core

Browse source
This commit is contained in:
Thomas Müller 2013-08-22 00:18:14 +02:00
commit fbc23c4a01
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/user_ldap/lib/jobs.php
View file

@ -82,7 +82,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
$hasChanged = true;
}
foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
\OCP\Util::emitHook('OC_User', 'post_addFromGroup', array('uid' => $addedUser, 'gid' => $group));
\OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
\OCP\Util::INFO);

16
lib/public/share.php
View file

@ -209,7 +209,7 @@ class Share {
}
}
}
// let's get the parent for the next round
$meta = $cache->get((int)$source);
if($meta !== false) {
@ -840,7 +840,11 @@ class Share {
// Get filesystem root to add it to the file target and remove from the
// file source, match file_source with the file cache
if ($itemType == 'file' || $itemType == 'folder') {
$root = \OC\Files\Filesystem::getRoot();
if(!is_null($uidOwner)) {
$root = \OC\Files\Filesystem::getRoot();
} else {
$root = '';
}
$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid`';
if (!isset($item)) {
$where .= ' WHERE `file_target` IS NOT NULL';
@ -1303,11 +1307,11 @@ class Share {
'run' => &$run,
'error' => &$error
));
if ($run === false) {
throw new \Exception($error);
}
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
@ -1398,11 +1402,11 @@ class Share {
'run' => &$run,
'error' => &$error
));
if ($run === false) {
throw new \Exception($error);
}
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {