[Phpgroupware-cvs] CVS: phpgwapi/inc class.vfs_sql.inc.php,1.15.2.3,1.15.2.4

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.vfs_sql.inc.php 
Log Message:
GNU Patch #108.

Index: class.vfs_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.vfs_sql.inc.php,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -r1.15.2.3 -r1.15.2.4
*** class.vfs_sql.inc.php       14 Feb 2002 02:23:07 -0000      1.15.2.3
--- class.vfs_sql.inc.php       8 Apr 2002 14:23:15 -0000       1.15.2.4
***************
*** 143,148 ****
  
                        /* We store the linked directories in an array now, so 
we don't have to make the SQL call again */
! 
!                       $query = $GLOBALS['phpgw']->db->query ("SELECT 
directory, name, link_directory, link_name FROM phpgw_vfs WHERE link_directory 
!= '' AND link_name != ''" . $this->extra_sql (array ('query_type' => 
VFS_SQL_SELECT)));
  
                        $this->linked_dirs = array ();
--- 143,155 ----
  
                        /* We store the linked directories in an array now, so 
we don't have to make the SQL call again */
!                       if ($GLOBALS['phpgw_info']['server']['db_type']=='mssql'
!                               || 
$GLOBALS['phpgw_info']['server']['db_type']=='sybase')
!                       {
!                               $query = $GLOBALS['phpgw']->db->query ("SELECT 
directory, name, link_directory, link_name FROM phpgw_vfs WHERE 
CONVERT(varchar,link_directory) != '' AND CONVERT(varchar,link_name) != ''" . 
$this->extra_sql (array ('query_type' => VFS_SQL_SELECT)), __LINE__,__FILE__);
!                       }
!                       else
!                       {
!                               $query = $GLOBALS['phpgw']->db->query ("SELECT 
directory, name, link_directory, link_name FROM phpgw_vfs WHERE link_directory 
!= '' AND link_name != ''" . $this->extra_sql (array ('query_type' => 
VFS_SQL_SELECT)), __LINE__,__FILE__);
!                       }
  
                        $this->linked_dirs = array ();