mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-26 05:42:13 +09:00
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:
parent
63f9e43024
commit
e3685a7bd8
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue