extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for not set link_pathes

Browse Source
This commit is contained in:
Ralf Becker 2005-06-07 11:44:49 +00:00
parent 5748d1adb5
commit df209c0b0b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infolog/inc/class.bolink.inc.php
View File

@ -165,7 +165,7 @@
{ {
if ($this->debug) if ($this->debug)
{ {
echo "<p>bolink.link('$app1',$id1,'".print_r($app2,true)."',$id2,'$remark',$owner,$lastmod)</p>\n"; echo "<p>bolink.link('$app1',$id1,'".print_r($app2,true)."',".print_r($id2,true).",'$remark',$owner,$lastmod)</p>\n";
} }
if (!$app1 || !$app2 || $app1 == $app2 && $id1 == $id2) if (!$app1 || !$app2 || $app1 == $app2 && $id1 == $id2)
{ {
@ -658,7 +658,7 @@
} }
$fname = $this->vfs_path($app,$id,$file['name']); $fname = $this->vfs_path($app,$id,$file['name']);
$tfname = ''; $tfname = '';
if (!empty($file['path'])) if (!empty($file['path']) && is_array($this->link_pathes) && count($this->link_pathes))
{ {
$file['path'] = str_replace('\\\\','/',$file['path']); // vfs uses only '/' $file['path'] = str_replace('\\\\','/',$file['path']); // vfs uses only '/'
@reset($this->link_pathes); @reset($this->link_pathes);
@ -681,7 +681,6 @@
} }
} }
$this->vfs->override_acl = 1; $this->vfs->override_acl = 1;
$this->vfs->cp(array( $this->vfs->cp(array(
'symlink' => !!$tfname, // try a symlink 'symlink' => !!$tfname, // try a symlink
'from' => $tfname ? $tfname : $file['tmp_name'], 'from' => $tfname ? $tfname : $file['tmp_name'],