r8032 누락추가

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8034 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2011-01-20 06:21:14 +00:00
parent 3056eebd23
commit fdab40757a

View file

@ -534,7 +534,7 @@
$left_join = array(); $left_join = array();
// why??? // why???
$left_tables= (array)$output->left_tables; f(!$output->columns) $output->columns = array('*');$left_tables= (array)$output->left_tables;
foreach($left_tables as $key => $val) { foreach($left_tables as $key => $val) {
$condition = $this->_getCondition($output->left_conditions[$key],$output->column_type); $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
@ -543,9 +543,9 @@
} }
} }
if(!$output->columns) { $click_count = array();
$columns = '*'; if(!$output->columns) $output->columns = array('*');
} else {
$column_list = array(); $column_list = array();
foreach($output->columns as $key => $val) { foreach($output->columns as $key => $val) {
$name = $val['name']; $name = $val['name'];
@ -563,7 +563,6 @@
} }
} }
$columns = implode(',',$column_list); $columns = implode(',',$column_list);
}
$condition = $this->getCondition($output); $condition = $this->getCondition($output);