Index: branches/unlabeled/unlabeled-1.23.2/core/kernel/db/dblist.php =================================================================== diff -u -N -r7645 -r7701 --- branches/unlabeled/unlabeled-1.23.2/core/kernel/db/dblist.php (.../dblist.php) (revision 7645) +++ branches/unlabeled/unlabeled-1.23.2/core/kernel/db/dblist.php (.../dblist.php) (revision 7701) @@ -280,6 +280,22 @@ } } + function GetNoFilterCount() + { + if (!$this->Counted) { + $this->CountRecs(); + } + return $this->NoFilterCount; + } + + function GetRecordsCount() + { + if (!$this->Counted) { + $this->CountRecs(); + } + return $this->RecordsCount; + } + function getCountSQL($sql) { if ( preg_match("/DISTINCT(.*?)FROM(?!_)/is",$sql,$regs ) ) @@ -604,7 +620,7 @@ $name = $field[0]; $ret .= isset($this->Fields[$name]) && !isset($this->VirtualFields[$name]) ? '`'.$this->TableName.'`.' : ''; - + if ($field[0] == 'RAND()' || $field[2]) { $ret .= $field[0].' '.$field[1].','; }