From: <sy...@us...> - 2004-08-30 15:58:49
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26365/lib Modified Files: Tag: BRANCH-1-9 tikilib.php Log Message: some missing in db queries Index: tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.514.2.59 retrieving revision 1.514.2.60 diff -u -d -r1.514.2.59 -r1.514.2.60 --- tikilib.php 30 Aug 2004 06:51:43 -0000 1.514.2.59 +++ tikilib.php 30 Aug 2004 15:58:35 -0000 1.514.2.60 @@ -2211,8 +2211,8 @@ $user = addslashes($user); // TODO: same as list_users - $query = "select u.*, p.value as realName from tiki_friends as f, users_users as u left join tiki_user_preferences p on u.login=p.user and p.prefName = 'realName' where u.login=f.friend and f.user='$user' and f.user <> f.friend $mid order by $sort_mode limit $offset, $maxRecords"; - $query_cant = "select count(*) from tiki_friends as f, users_users as u left join tiki_user_preferences p on u.login=p.user and p.prefName = 'realName' where u.login=f.friend and f.user='$user' $mid"; + $query = "select u.*, p.`value` as realName from `tiki_friends` as f, `users_users` as u left join `tiki_user_preferences` p on u.`login`=p.`user` and p.`prefName` = 'realName' where u.`login`=f.`friend` and f.`user`='$user' and f.`user` <> f.`friend` $mid order by $sort_mode limit $offset, $maxRecords"; + $query_cant = "select count(*) from `tiki_friends` as f, `users_users` as u left join `tiki_user_preferences` p on u.`login`=p.`user` and p.`prefName` = 'realName' where u.`login`=f.`friend` and f.`user`='$user' $mid"; $result = $this->query($query); $cant = $this->getOne($query_cant); $ret = Array(); @@ -2259,8 +2259,8 @@ // TODO: This is lousy, later we have to configure what fields would be fetched // but how to get preferences avoiding the join, sort by any field and paginate without // loading all user list in memory? - $query = "select u.*, f.user is not null as friend, p.value as realName from users_users as u left join tiki_friends as f on u.login=f.friend and f.user='".addslashes($user)."' left join tiki_user_preferences p on u.login=p.user and p.prefName='realName' $mid order by $sort_mode limit $offset, $maxRecords"; - $query_cant = "select count(*) from users_users u left join tiki_user_preferences p on u.login=p.user and p.prefName='realName' $mid"; + $query = "select u.*, f.`user` is not null as friend, p.`value` as realName from `users_users` as u left join `tiki_friends` as f on u.`login`=f.`friend` and f.`user`='".addslashes($user)."' left join `tiki_user_preferences` p on u.`login`=p.`user` and p.`prefName`='realName' $mid order by $sort_mode limit $offset, $maxRecords"; + $query_cant = "select count(*) from `users_users` u left join `tiki_user_preferences` p on u.`login`=p.`user` and p.`prefName`='realName' $mid"; $result = $this->query($query); $cant = $this->getOne($query_cant); $ret = Array(); |