[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/inc class.soinfolog.inc.php, 1.10.2.1.2.
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.soinfolog.inc.php, 1.10.2.1.2.5, 1.10.2.1.2.6 |
Date: |
Mon, 25 Aug 2003 11:19:47 -0400 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv24031/infolog/inc
Modified Files:
Tag: Version-0_9_16-branch
class.soinfolog.inc.php
Log Message:
search: fixed ambigous info_id, if we use the join; use the join only if we
have a query-string
Index: class.soinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.10.2.1.2.5
retrieving revision 1.10.2.1.2.6
diff -C2 -r1.10.2.1.2.5 -r1.10.2.1.2.6
*** class.soinfolog.inc.php 24 Aug 2003 22:16:42 -0000 1.10.2.1.2.5
--- class.soinfolog.inc.php 25 Aug 2003 15:19:44 -0000 1.10.2.1.2.6
***************
*** 455,459 ****
if (count($links))
{
! $link_extra = ($action == 'sp' ? 'OR' :
'AND').' info_id IN ('.implode(',',$links).')';
}
}
--- 455,459 ----
if (count($links))
{
! $link_extra = ($action == 'sp' ? 'OR' :
'AND').' phpgw_infolog.info_id IN ('.implode(',',$links).')';
}
}
***************
*** 475,478 ****
--- 475,479 ----
$filtermethod .= ' AND info_cat='.intval($cat_id).' ';
}
+ $join = '';
if ($query) // we search in
_from, _subject, _des and _extra_value for $query
{
***************
*** 480,483 ****
--- 481,485 ----
$sql_query = "AND (info_from like '%$query%' OR
info_subject ".
"LIKE
'%$query%' OR info_des LIKE '%$query%' OR info_extra_value LIKE '%$query%') ";
+ $join = 'LEFT JOIN phpgw_infolog_extra ON
phpgw_infolog.info_id=phpgw_infolog_extra.info_id';
}
$pid = 'AND info_id_parent='.($action == 'sp' ?
$action_id : 0);
***************
*** 491,495 ****
if ($action == '' || $action == 'sp' || count($links))
{
! $query = "FROM phpgw_infolog LEFT JOIN
phpgw_infolog_extra ON phpgw_infolog.info_id=phpgw_infolog_extra.info_id WHERE
($filtermethod $pid $sql_query) $link_extra";
$this->db->query($sql='SELECT DISTINCT
phpgw_infolog.info_id '.$query,__LINE__,__FILE__);
$total = $this->db->num_rows();
--- 493,497 ----
if ($action == '' || $action == 'sp' || count($links))
{
! $query = "FROM phpgw_infolog $join WHERE
($filtermethod $pid $sql_query) $link_extra";
$this->db->query($sql='SELECT DISTINCT
phpgw_infolog.info_id '.$query,__LINE__,__FILE__);
$total = $this->db->num_rows();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.soinfolog.inc.php, 1.10.2.1.2.5, 1.10.2.1.2.6,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.2.27, 1.34.2.6.2.28 class.uiprojects.inc.php, 1.47.2.7.2.27, 1.47.2.7.2.28
- Next by Date:
[Phpgroupware-cvs] CVS: projects/templates/default preferences.tpl, 1.19.2.2.2.3, 1.19.2.2.2.4
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.2.27, 1.34.2.6.2.28 class.uiprojects.inc.php, 1.47.2.7.2.27, 1.47.2.7.2.28
- Next by thread:
[Phpgroupware-cvs] CVS: projects/templates/default preferences.tpl, 1.19.2.2.2.3, 1.19.2.2.2.4
- Index(es):