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

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-07-28 19:02:10 +09:00 • committed by GitHub
commit 0598ae4b95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 132 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -624,7 +624,8 @@ class FrontEndFileHandler extends Handler
{
$url .= '?t=' . filemtime($file->fileFullPath);
}
$result[] = array('file' => $url);
$attrs = empty($file->jstype) ? '' : (' type="' . $file->jstype . '"');
$result[] = array('file' => $url, 'attrs' => $attrs);
}
else
{
@ -642,7 +643,7 @@ class FrontEndFileHandler extends Handler
Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, $concat_content);
}
$concat_filename .= '?t=' . filemtime(\RX_BASEDIR . $concat_filename);
$result[] = array('file' => \RX_BASEURL . $concat_filename);
$result[] = array('file' => \RX_BASEURL . $concat_filename, 'attrs' => '');
}
}
}

5
classes/module/ModuleObject.class.php
View file

@ -235,7 +235,7 @@ class ModuleObject extends BaseObject
catch (Rhymix\Framework\Exception $e)
{
$this->stop($e->getMessage(), -2);
$this->add('rx_error_location', $e->getFile() . ':' . $e->getLine());
$this->add('rx_error_location', $e->getUserFileAndLine());
}
}
@ -857,8 +857,7 @@ class ModuleObject extends BaseObject
catch (Rhymix\Framework\Exception $e)
{
$output = new BaseObject(-2, $e->getMessage());
$location = $e->getFile() . ':' . $e->getLine();
$output->add('rx_error_location', $location);
$output->add('rx_error_location', $e->getUserFileAndLine());
}
// Trigger after specific action

4
classes/validator/Validator.class.php
View file

@ -389,8 +389,8 @@ class Validator
}
/**
* Returns the last error infomation including a field name and an error message.
* @return array The last error infomation
* Returns the last error information including a field name and an error message.
* @return array The last error information
*/
function getLastError()
{