[Phpgroupware-cvs] phpgwapi/inc class.vfs_sql.inc.php, 1.15.2.6.2.6, 1.15.2.6.2.7

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv11554

Modified Files:
      Tag: Version-0_9_16-branch
        class.vfs_sql.inc.php 
Log Message:
fix for bug #6775 pt2


Index: class.vfs_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.vfs_sql.inc.php,v
retrieving revision 1.15.2.6.2.6
retrieving revision 1.15.2.6.2.7
diff -C2 -d -r1.15.2.6.2.6 -r1.15.2.6.2.7
*** class.vfs_sql.inc.php       10 Oct 2003 09:42:48 -0000      1.15.2.6.2.6
--- class.vfs_sql.inc.php       26 Nov 2003 21:28:19 -0000      1.15.2.6.2.7
***************
*** 2240,2244 ****
                                return $size;
                        }
! 
                        $ls_array = $this->ls (array(
                                        'string'        => $p->fake_full_path,
--- 2240,2244 ----
                                return $size;
                        }
!                       /*
                        $ls_array = $this->ls (array(
                                        'string'        => $p->fake_full_path,
***************
*** 2260,2274 ****
                                        continue;
                                }
! */
  
                                $size += $file_array['size'];
                        }
! 
!                       if ($data['checksubdirs'])
!                       {
                                $query = $GLOBALS['phpgw']->db->query ("SELECT 
size FROM phpgw_vfs WHERE directory='".$p->fake_leading_dirs_clean."' AND 
name='".$p->fake_name_clean."'" . $this->extra_sql (array ('query_text' => 
VFS_SQL_SELECT)));
                                $GLOBALS['phpgw']->db->next_record ();
                                $size += $GLOBALS['phpgw']->db->Record[0];
!                       }
  
                        return $size;
--- 2260,2274 ----
                                        continue;
                                }
! *//*
  
                                $size += $file_array['size'];
                        }
!                       */
!                       //if ($data['checksubdirs'])
!                       //{
                                $query = $GLOBALS['phpgw']->db->query ("SELECT 
size FROM phpgw_vfs WHERE directory='".$p->fake_leading_dirs_clean."' AND 
name='".$p->fake_name_clean."'" . $this->extra_sql (array ('query_text' => 
VFS_SQL_SELECT)));
                                $GLOBALS['phpgw']->db->next_record ();
                                $size += $GLOBALS['phpgw']->db->Record[0];
!                       //}
  
                        return $size;