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

Merge 1.5.2.3 (~r10623)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10624 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-26 09:17:29 +00:00
parent 79fdf10866
commit e4306a789f
915 changed files with 71076 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

9
classes/db/queryparts/Query.class.php
View file

@ -25,7 +25,8 @@
, $conditions = null
, $groups = null
, $orderby = null
, $limit = null){
, $limit = null
, $priority = null){
$this->queryID = $queryID;
$this->action = $action;
$this->priority = $priority;
@ -313,8 +314,8 @@
if(count($this->columns) > 0){ // The if is for delete statements, all others must have columns
foreach($this->columns as $column){
if($column->show()){
$arg = $column->getArgument();
if($arg) $this->arguments[] = $arg;
$args = $column->getArguments();
if($args) $this->arguments = array_merge($this->arguments, $args);
}
}
}
@ -339,4 +340,4 @@
?>
?>