reverse merge error fix (r10600 with r10563)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10713 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 01:22:41 +00:00
parent 63f9e43024
commit e3685a7bd8

View file

@ -784,7 +784,7 @@
$count_query .= (__DEBUG_QUERY__&1 && $queryObject->queryID)?sprintf (' '.$this->comment_syntax, $queryObject->queryID):'';
$result = $this->_query($count_query, $connection);
$count_output = $this->_fetch($result);
$total_count = (int)(isset($count_output->output) ? $count_output->count : NULL);
$total_count = (int)(isset($count_output->count) ? $count_output->count : NULL);
$list_count = $limit->list_count->getValue();
if (!$list_count) $list_count = 20;