extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-03 11:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make static p_path_parts distinguish between objects and arrays

Browse Source
This commit is contained in:
zone 2001-12-15 05:14:22 +00:00
parent 8f19156054
commit 7baea35779
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.vfs_sql.inc.php
View File

@ -684,9 +684,9 @@
$string = $this->getabsolutepath ($string, array ($relatives[0]), $fake); $string = $this->getabsolutepath ($string, array ($relatives[0]), $fake);
if($p_path_parts[$string][$rarray['mask']]) if ($p_path_parts[$string][$rarray['mask'][$object]])
{ {
return $p_path_parts[$string][$rarray['mask']]; return ($p_path_parts[$string][$rarray['mask'][$object]]);
} }
if ($fake) if ($fake)
@ -771,7 +771,7 @@
$rarray['real_full_path'] = ereg_replace ("^$this->basedir", '', $rarray['real_full_path']); $rarray['real_full_path'] = ereg_replace ("^$this->basedir", '', $rarray['real_full_path']);
$rarray['real_full_path'] = ereg_replace ("^$link_info[directory]" . SEP . "$link_info[name]", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']); $rarray['real_full_path'] = ereg_replace ("^$link_info[directory]" . SEP . "$link_info[name]", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
$p = $this->path_parts ($rarray["real_full_path"], array (RELATIVE_NONE|VFS_REAL), True, True); $p = $this->path_parts ($rarray['real_full_path'], array (RELATIVE_NONE|VFS_REAL), True, True);
$rarray['real_leading_dirs'] = $p->real_leading_dirs; $rarray['real_leading_dirs'] = $p->real_leading_dirs;
$rarray['real_extra_path'] = $p->real_extra_path; $rarray['real_extra_path'] = $p->real_extra_path;
@ -815,12 +815,12 @@
if ($object) if ($object)
{ {
$p_path_parts[$string][$rarray['mask']] = $robject; $p_path_parts[$string][$rarray['mask'][$object]] = $robject;
return ($robject); return ($robject);
} }
else else
{ {
$p_path_parts[$string][$rarray['mask']] = $rarray; $p_path_parts[$string][$rarray['mask'][$object]] = $rarray;
return ($rarray); return ($rarray);
} }
} }