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

issue 173 - php4 parse error

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9243 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-20 12:31:50 +00:00
parent 0cc9b2e470
commit de8301ccbc
6 changed files with 57 additions and 1287 deletions
Download patch file Download diff file Expand all files Collapse all files

14
classes/db/DBPostgresql.class.php
View file

@ -518,7 +518,8 @@ class DBPostgresql extends DB
if($orderBy != '') $orderBy = ' ORDER BY ' . $orderBy;
$limit = $query->getLimitString();
if($limit != '') $limit = ' LIMIT ' . $query->getLimit()->getLimit() . ' OFFSET ' . $query->getLimit()->getOffset();
$limitObject = $query->getLimit();
if($limit != '') $limit = ' LIMIT ' . $limitObject->getLimit() . ' OFFSET ' . $limitObject->getOffset();
return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
}
@ -554,7 +555,8 @@ class DBPostgresql extends DB
return;
}
if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
$limit = $queryObject->getLimit();
if ($limit && $limit->isPageHandler()) {
// Total count
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($queryObject->getWhereString() === '' ? '' : ' WHERE '. $queryObject->getWhereString()));
if ($queryObject->getGroupByString() != '') {
@ -568,19 +570,19 @@ class DBPostgresql extends DB
// Total pages
if ($total_count) {
$total_page = (int) (($total_count - 1) / $queryObject->getLimit()->list_count) + 1;
$total_page = (int) (($total_count - 1) / $limit->list_count) + 1;
} else $total_page = 1;
$virtual_no = $total_count - ($queryObject->getLimit()->page - 1) * $queryObject->getLimit()->list_count;
$virtual_no = $total_count - ($limit->page - 1) * $limit->list_count;
$data = $this->_fetch($result, $virtual_no);
$buff = new Object ();
$buff->total_count = $total_count;
$buff->total_page = $total_page;
$buff->page = $queryObject->getLimit()->page->getValue();
$buff->page = $limit->page->getValue();
$buff->data = $data;
$buff->page_navigation = new PageHandler($total_count, $total_page, $queryObject->getLimit()->page->getValue(), $queryObject->getLimit()->page_count);
$buff->page_navigation = new PageHandler($total_count, $total_page, $limit->page->getValue(), $limit->page_count);
}else{
$data = $this->_fetch($result);
$buff = new Object ();