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

rollback 12571-12581

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@12676 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-02-04 05:48:33 +00:00
parent eac2272e05
commit 6ada9a3639
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/context/Context.class.php
View file

@ -741,12 +741,12 @@ class Context {
foreach($charset_list as $charset)
{
array_walk($obj,array('Context','checkConvertFlag'),$charset);
array_walk($obj,'Context::checkConvertFlag',$charset);
$flag = Context::checkConvertFlag($flag = true);
if($flag)
{
if($charset == 'UTF-8') return $obj;
array_walk($obj,array('Context','doConvertEncoding'),$charset);
array_walk($obj,'Context::doConvertEncoding',$charset);
return $obj;
}
}
@ -767,7 +767,7 @@ class Context {
if($charset)
{
if(is_array($val))
array_walk($val,array('Context','checkConvertFlag'),$charset);
array_walk($val,'Context::checkConvertFlag',$charset);
else if($val && iconv($charset,$charset,$val)!=$val) $flag = false;
else $flag = false;
}
@ -792,7 +792,7 @@ class Context {
{
if (is_array($val))
{
array_walk($val,array('Context','doConvertEncoding'),$charset);
array_walk($val,'Context::doConvertEncoding',$charset);
}
else $val = iconv($charset,'UTF-8',$val);
}

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

@ -102,10 +102,7 @@
$file->filePath = $this->_getAbsFileUrl($pathInfo['dirname']);
$file->fileRealPath = FileHandler::getRealPath($pathInfo['dirname']);
$file->fileExtension = strtolower($pathInfo['extension']);
// Remove .min
$file->fileNameNoExt = preg_replace("/\.{$file->fileExtension}$/", '', $file->fileName);
$file->fileNameNoExt = preg_replace("/\.min$/", '', $file->fileNameNoExt);
$file->fileNameNoExt = preg_replace('/\.min$/', '', $pathInfo['filename']);
$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
if(strpos($file->filePath, '://') === FALSE)