fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 15:22:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

reverse merge from 1.6.0 (r10563)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10716 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:12:20 +00:00
parent 57a0cc59b1
commit a4b3a914a5
6 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/db/DBCubrid.class.php
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->count) ? $count_output->count : NULL);
$total_count = (int)(isset($count_output->output) ? $count_output->count : NULL);
$list_count = $limit->list_count->getValue();
if (!$list_count) $list_count = 20;
@ -834,9 +834,8 @@
return $buff;
}
function &getParser($force = FALSE){
$dbParser = new DBParser('"', '"', $this->prefix);
return $dbParser;
function getParser($force = FALSE){
return new DBParser('"', '"', $this->prefix);
}
function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {