[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.vfs_sql.inc.php,1.18,1.19
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.vfs_sql.inc.php,1.18,1.19 |
Date: |
Mon, 08 Apr 2002 10:23:29 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv21481/phpgwapi/inc
Modified Files:
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.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.vfs_sql.inc.php 14 Feb 2002 02:16:14 -0000 1.18
--- class.vfs_sql.inc.php 8 Apr 2002 14:23:27 -0000 1.19
***************
*** 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,156 ----
/* 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 ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.vfs_sql.inc.php,1.18,1.19,
Mark A Peters <address@hidden> <=