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

reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:27:55 +00:00
parent a4b3a914a5
commit f7330acf02
13 changed files with 137 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -784,7 +784,7 @@
$count_query .= (__DEBUG_QUERY__&1 && $queryObject->queryID)?sprintf (' '.$this->comment_syntax, $queryObject->queryID):'';
$result = $this->_query($count_query, $connection);
$count_output = $this->_fetch($result);
$total_count = (int)(isset($count_output->output) ? $count_output->count : NULL);
$total_count = (int)(isset($count_output->count) ? $count_output->count : NULL);
$list_count = $limit->list_count->getValue();
if (!$list_count) $list_count = 20;
@ -866,4 +866,4 @@
}
return new DBCubrid;
?>
?>

4
classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
View file

@ -35,11 +35,11 @@
function getArgument(){
return null;
}
function getArguments(){
return array();
}
}
?>
?>

16
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -70,6 +70,8 @@
$map = &$this->cssMap;
$mapIndex = &$this->cssMapIndex;
$key = $file->filePath . $file->fileName . "\t" . $file->targetIe . "\t" . $file->media;
$this->_arrangeCssIndex($pathInfo['dirname'], $file);
}
else if ($file->fileExtension == 'js')
{
@ -265,4 +267,18 @@
return $path;
}
private function _arrangeCssIndex($dirName, $file)
{
if($file->index !== 0)
{
return;
}
$dirName = str_replace('./', '', $dirName);
$tmp = explode('/', $dirName);
$cssSortList = array('common'=>-100000, 'layouts'=>-90000, 'modules'=>-80000, 'widgets'=>-70000, 'addons'=>-60000);
$file->index = $cssSortList[$tmp[0]];
}
}