Issue 2144 JS or CSS file index default value is 0 and the index should have interval value.(NO NULL value.)

And remove all file should refer to '$this->'.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10896 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2012-07-14 18:19:22 +00:00
parent 6284a4c828
commit f71fcc8b31

View file

@ -143,6 +143,7 @@
if (!isset($map[$key]) || $mapIndex[$key] != $file->index) if (!isset($map[$key]) || $mapIndex[$key] != $file->index)
{ {
(is_null($file->index))?$file->index=0:$file->index=$file->index;
$this->unloadFile($args[0], $args[2], $args[1]); $this->unloadFile($args[0], $args[2], $args[1]);
$map[$file->index][$key] = $file; $map[$file->index][$key] = $file;
$mapIndex[$key] = $file->index; $mapIndex[$key] = $file->index;
@ -207,16 +208,16 @@
{ {
if ($type == 'css' || $type == 'all') if ($type == 'css' || $type == 'all')
{ {
$cssMap = array(); $this->cssMap = array();
$cssMapIndex = array(); $this->cssMapIndex = array();
} }
if ($type == 'js' || $type == 'all') if ($type == 'js' || $type == 'all')
{ {
$jsHeadMap = array(); $this->jsHeadMap = array();
$jsBodyMap = array(); $this->jsBodyMap = array();
$jsHeadMapIndex = array(); $this->jsHeadMapIndex = array();
$jsBodyMapIndex = array(); $this->jsBodyMapIndex = array();
} }
} }