reverse merge from 1.6.0 (r10563)

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

View file

@ -540,9 +540,8 @@
else return $this->queryPageLimit($queryObject, $result, $connection);
}
function &getParser($force = FALSE){
$dbParser = new DBParser("[", "]", $this->prefix);
return $dbParser;
function getParser($force = FALSE){
return new DBParser("[", "]", $this->prefix);
}
function queryError($queryObject){
@ -615,7 +614,7 @@
$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
return $buff;
}
$start_count = ($page - 1) * $list_count;
$this->param = $queryObject->getArguments();
$virtual_no = $total_count - $start_count;