fix merge conflicts
This commit is contained in:
commit
9bdad6fdbf
|
@ -81,7 +81,7 @@
|
|||
<type>text</type>
|
||||
<default></default>
|
||||
<notnull>false</notnull>
|
||||
<length>100</length>
|
||||
<length>255</length>
|
||||
</field>
|
||||
|
||||
<field>
|
||||
|
@ -133,7 +133,7 @@
|
|||
<type>text</type>
|
||||
<default></default>
|
||||
<notnull>false</notnull>
|
||||
<length>100</length>
|
||||
<length>255</length>
|
||||
</field>
|
||||
|
||||
<field>
|
||||
|
|
|
@ -104,10 +104,6 @@ class OC_Share {
|
|||
$counter++;
|
||||
}
|
||||
}
|
||||
if (isset($gid)) {
|
||||
$uid = $uid."@".$gid;
|
||||
}
|
||||
$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
|
||||
// Update mtime of shared folder to invoke a file cache rescan
|
||||
$rootView=new OC_FilesystemView('/');
|
||||
if (!$rootView->is_dir($sharedFolder)) {
|
||||
|
@ -119,6 +115,10 @@ class OC_Share {
|
|||
$rootView->mkdir($sharedFolder);
|
||||
}
|
||||
$rootView->touch($sharedFolder);
|
||||
if (isset($gid)) {
|
||||
$uid = $uid."@".$gid;
|
||||
}
|
||||
$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -170,14 +170,18 @@ class OC_Config{
|
|||
}
|
||||
$content .= ");\n?>\n";
|
||||
|
||||
$filename = OC::$SERVERROOT."/config/config.php";
|
||||
// Write the file
|
||||
$result=@file_put_contents( OC::$SERVERROOT."/config/config.php", $content );
|
||||
$result=@file_put_contents( $filename, $content );
|
||||
if(!$result) {
|
||||
$tmpl = new OC_Template( '', 'error', 'guest' );
|
||||
$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
|
||||
$tmpl->printPage();
|
||||
exit;
|
||||
}
|
||||
// Prevent others not to read the config
|
||||
@chmod($filename, 0640);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -319,6 +319,9 @@ class OC_Filesystem{
|
|||
if(substr($mountpoint,-1)!=='/'){
|
||||
$mountpoint=$mountpoint.'/';
|
||||
}
|
||||
if (self::getView() != null && $mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
|
||||
self::mkdir(basename($mountpoint));
|
||||
}
|
||||
self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue