From 862e07d9a3d2c86567f08d6230f36a80a42742b5 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 11 Oct 2010 10:00:31 +0000 Subject: [PATCH] revert backport r32465 as the deleted flag is not introduced into 10.1 yet. --- phpgwapi/inc/class.solink.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.solink.inc.php b/phpgwapi/inc/class.solink.inc.php index c4e32d23aa..d00ff2453e 100644 --- a/phpgwapi/inc/class.solink.inc.php +++ b/phpgwapi/inc/class.solink.inc.php @@ -344,7 +344,7 @@ class solink ), // retrieve the type of links, where the relation is realized as timesheet->infolog/tracker and projectmanager->timesheet array('table'=>self::TABLE, - 'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3', + 'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3', 'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app). (!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))), 'join'=>" a