From: <sy...@us...> - 2007-07-09 21:45:06
|
Update of /cvsroot/tikiwiki/tiki/lib/newsletters In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4014/lib/newsletters Modified Files: nllib.php Log Message: Instant-Auto-Merge from BRANCH-1-9 to HEAD Index: nllib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/newsletters/nllib.php,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- nllib.php 2 Jul 2007 01:34:42 -0000 1.58 +++ nllib.php 9 Jul 2007 21:45:07 -0000 1.59 @@ -469,7 +469,8 @@ $query.= " where tn.`nlId`=tsn.`nlId` $mid order by ".$this->convert_sortmode("$sort_mode"); $result = $this->query($query,$bindvars,$maxRecords,$offset); $ret = array(); - $cant = 0; + $query_cant = "select count(*) from `tiki_newsletters` tn, `tiki_sent_newsletters` tsn where tn.`nlId`=tsn.`nlId` $mid"; + $cant = $this->getOne($query_cant,$bindvars); while ($res = $result->fetchRow()) { if ($nlId) { @@ -486,7 +487,6 @@ continue; } $ret[] = $res; - ++$cant; } $retval = array(); |