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

Merge pull request #292 from kijin/develop

Browse source 
Merge with XE 1.8.16
This commit is contained in:
Kijin Sung 2016-02-18 21:44:21 +09:00
commit 98f12271f1
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/constants.php
View file

@ -3,7 +3,7 @@
/**
* RX_VERSION is the version number of the Rhymix CMS.
*/
define('RX_VERSION', '1.8.15');
define('RX_VERSION', '1.8.16');
/**
* RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch.

2
modules/layout/tpl/layout_modify.html
View file

@ -1,3 +1,3 @@
<load target="js/layout_modify.js" />
<include target="header.html" />
{$content}
{$content}

7
tests/unit/classes/ValidatorTest.php
View file

@ -4,8 +4,15 @@ class ValidatorTest extends \Codeception\TestCase\Test
{
public function _before()
{
$ob_level = ob_get_level();
$oContext = Context::getInstance();
$oContext->init();
while (ob_get_level() > $ob_level)
{
ob_end_clean();
}
}
public function testRequired()