phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Caeies
Subject: [Phpgroupware-cvs] phpgwapi/inc class.vfs_sql.inc.php
Date: Sat, 23 Dec 2006 00:40:15 +0000

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Caeies <Caeies> 06/12/23 00:40:15

Modified files:
        inc            : class.vfs_sql.inc.php 

Log message:
        When no files are found, don t try to use NextRecord() ...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.vfs_sql.inc.php?cvsroot=phpgwapi&r1=1.37&r2=1.38

Patches:
Index: class.vfs_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.vfs_sql.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- class.vfs_sql.inc.php       22 Dec 2006 23:53:55 -0000      1.37
+++ class.vfs_sql.inc.php       23 Dec 2006 00:40:15 -0000      1.38
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage vfs
-       * @version $Id: class.vfs_sql.inc.php,v 1.37 2006/12/22 23:53:55 Caeies 
Exp $
+       * @version $Id: class.vfs_sql.inc.php,v 1.38 2006/12/23 00:40:15 Caeies 
Exp $
        */
 
        /**
@@ -2232,8 +2232,11 @@
                                                . " FROM phpgw_vfs WHERE 
directory='{$p->fake_leading_dirs_clean}' AND name='{$p->fake_name_clean}' " 
                                                . $this->extra_sql (array 
('query_type' => VFS_SQL_SELECT));
 
-
                                $query = $GLOBALS['phpgw']->db->query ($sql, 
__LINE__, __FILE__);
+                               if($GLOBALS['phpgw']->db->num_rows() == 0)
+                               {
+                                       return array();
+                               }
                                $GLOBALS['phpgw']->db->next_record();
                                $record = $this->Record();
                                //echo 'record: ' . _debug_array($record);
@@ -2281,7 +2284,6 @@
                                                {
                                                        continue;
                                                }
-
                                                $rarray[] = 
$this->get_real_info (array(
                                                                'string'        
=> $p->real_full_path . SEP . $filename,
                                                                'relatives'     
=> array ($p->mask)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]