sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing

remotes/origin/stable
Michael Gapczynski 2011-08-16 20:21:57 +07:00
parent 582dca4d91 42ed3c6b7e
commit 0edce1796b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/lib_share.php
Unescape Escape View File

@ -121,7 +121,7 @@ class OC_Share {
}
} else if (isset($uid)) {
// TODO Check if this is necessary, only constructor needs it as IN. It would be better for other queries to just return =$uid
$in = "'".$uid."'";
$in .= "'".$uid."'";
$groups = OC_Group::getUserGroups($uid);
foreach ($groups as $group) {
$in .= ", '".$uid."@".$group."'";

2
files/js/files.js
Unescape Escape View File

@ -27,7 +27,7 @@ $(document).ready(function() {
});
// Sets the file link behaviour :
$('td.filename.name a').live('click',function(event) {
$('td.filename a').live('click',function(event) {
event.preventDefault();
var filename=$(this).parent().parent().data('file');
if(!FileList.isLoading(filename)){