mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-05-10 04:24:14 +09:00
#18865278 : fixed path problem in outpage with optimizer
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7468 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
a34a0674ec
commit
9f7c1210cf
1 changed files with 5 additions and 3 deletions
|
|
@ -48,7 +48,11 @@
|
||||||
$files = array();
|
$files = array();
|
||||||
$hash = "";
|
$hash = "";
|
||||||
foreach($source_files as $key => $file) {
|
foreach($source_files as $key => $file) {
|
||||||
if(!$file || !$file['file'] || !file_exists($file['file'])) continue;
|
if($file['file'][0] == '/')
|
||||||
|
{
|
||||||
|
if(!file_exists($_SERVER['DOCUMENT_ROOT'].$file['file'])) continue;
|
||||||
|
}
|
||||||
|
else if(!$file || !$file['file'] || !file_exists($file['file'])) continue;
|
||||||
$file['file'] = $source_files[$key]['file'] = str_replace("\\","/",$file['file']);
|
$file['file'] = $source_files[$key]['file'] = str_replace("\\","/",$file['file']);
|
||||||
if(empty($file['optimized']) || preg_match('/^https?:\/\//i', $file['file']) ) $files[] = $file;
|
if(empty($file['optimized']) || preg_match('/^https?:\/\//i', $file['file']) ) $files[] = $file;
|
||||||
else{
|
else{
|
||||||
|
|
@ -77,14 +81,12 @@
|
||||||
FileHandler::writeFile($list_file, $str);
|
FileHandler::writeFile($list_file, $str);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
array_unshift($files, array('file' => sprintf($this->script_file, $list_file_hash, $type) , 'media' => 'all'));
|
array_unshift($files, array('file' => sprintf($this->script_file, $list_file_hash, $type) , 'media' => 'all'));
|
||||||
$files = $this->_getOptimizedRemoved($files);
|
$files = $this->_getOptimizedRemoved($files);
|
||||||
if(!count($files)) return $files;
|
if(!count($files)) return $files;
|
||||||
|
|
||||||
$url_info = parse_url(Context::getRequestUri());
|
$url_info = parse_url(Context::getRequestUri());
|
||||||
$abpath = $url_info['path'];
|
$abpath = $url_info['path'];
|
||||||
|
|
||||||
foreach($files as $key => $val) {
|
foreach($files as $key => $val) {
|
||||||
$file = $val['file'];
|
$file = $val['file'];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue