[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php, 1.14.2.4, 1
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php, 1.14.2.4, 1.14.2.5 class.soinfolog.inc.php, 1.10.2.4, 1.10.2.5 |
Date: |
Tue, 22 Jul 2003 12:34:08 -0400 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv14235
Modified Files:
Tag: Version-0_9_14-branch
class.boinfolog.inc.php class.soinfolog.inc.php
Log Message:
fix for sub-view (was broken by new so-layer backported from .16)
Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -C2 -r1.14.2.4 -r1.14.2.5
*** class.boinfolog.inc.php 2 Jul 2003 22:57:25 -0000 1.14.2.4
--- class.boinfolog.inc.php 22 Jul 2003 16:34:05 -0000 1.14.2.5
***************
*** 232,236 ****
{
return
$this->so->search($order,$sort,$filter,$cat_id,$query,
! $action,$addr_id ? $addr_id :
$proj_id,$info_id,$ordermethod,$start,$total);
}
--- 232,237 ----
{
return
$this->so->search($order,$sort,$filter,$cat_id,$query,
! $action,$addr_id ? $addr_id : ($proj_id ?
$proj_id : $info_id),
! $ordermethod,$start,$total);
}
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C2 -r1.10.2.4 -r1.10.2.5
*** class.soinfolog.inc.php 8 Jul 2003 23:31:32 -0000 1.10.2.4
--- class.soinfolog.inc.php 22 Jul 2003 16:34:05 -0000 1.10.2.5
***************
*** 365,369 ****
if ($order)
{
! $ordermethod = 'ORDER BY ' .
$this->db->db_addslashes($order) . ' ' . $this->db->db_addslashes($sort);
}
else
--- 365,369 ----
if ($order)
{
! $ordermethod = 'ORDER BY ' .
$this->db->db_addslashes($order) . ' ' . $this->db->db_addslashes($sort);
}
else
***************
*** 380,383 ****
--- 380,384 ----
$filtermethod .= ' AND info_cat='.intval($cat_id).' ';
}
+ $action_id = intval($action_id);
switch ($action)
{
***************
*** 393,397 ****
"like
'%$query%' OR info_des like '%$query%') ";
}
! $pid = 'AND info_id_parent='.($action == 'sp' ?
$info_id : 0);
if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
--- 394,398 ----
"like
'%$query%' OR info_des like '%$query%') ";
}
! $pid = 'AND info_id_parent='.($action == 'sp' ?
$action_id : 0);
if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
***************
*** 403,408 ****
if ($action == '' || $action == 'sp' || count($links))
{
! $this->db->query($sql="SELECT COUNT(*) FROM
phpgw_infolog i WHERE ($filtermethod $pid $sql_query)
$link_extra",__LINE__,__FILE__);
!
$this->db->next_record();
$total = $this->db->f(0);
--- 404,409 ----
if ($action == '' || $action == 'sp' || count($links))
{
! $this->db->query("SELECT COUNT(*) FROM
phpgw_infolog WHERE $filtermethod $pid $sql_query",__LINE__,__FILE__);
!
$this->db->next_record();
$total = $this->db->f(0);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php, 1.14.2.4, 1.14.2.5 class.soinfolog.inc.php, 1.10.2.4, 1.10.2.5,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.37, 1.71.2.38 class.socalendar_sql.inc.php, 1.28.2.5, 1.28.2.6
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/setup setup.inc.php, 1.15.2.3.2.3, 1.15.2.3.2.4
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php, 1.71.2.37, 1.71.2.38 class.socalendar_sql.inc.php, 1.28.2.5, 1.28.2.6
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/setup setup.inc.php, 1.15.2.3.2.3, 1.15.2.3.2.4
- Index(es):