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

Fix for cubrid - bug introduced in r9737 and fix for updateLayout - extra_vars attribute appears twice.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9762 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-10-26 10:18:52 +00:00
parent 4a54cb3186
commit d7a4598a96
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/db/DBCubrid.class.php
View file

@ -620,6 +620,7 @@
}
function queryPageLimit($queryObject, $result, $connection){
$limit = $queryObject->getLimit();
// Total count
$temp_where = $queryObject->getWhereString(true, false);
$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '. $temp_where));

1
modules/layout/queries/updateLayout.xml
View file

@ -7,7 +7,6 @@
<column name="extra_vars" var="extra_vars" />
<column name="layout" var="layout" />
<column name="layout_path" var="layout_path" />
<column name="extra_vars" var="extra_vars" />
</columns>
<conditions>
<condition operation="equal" column="layout_srl" var="layout_srl" filter="number" notnull="notnull" />