fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/abspath' into develop

Browse source
This commit is contained in:
bnu 2013-11-23 22:08:02 +09:00
commit bb22239ec4
41 changed files with 157 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/install/install.admin.controller.php
View file

@ -142,7 +142,7 @@ class installAdminController extends install
$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
if(file_exists($homeMenuCacheFile))
{
@include($homeMenuCacheFile);
include($homeMenuCacheFile);
}
if(!$homeMenuSrl || $homeMenuSrl != $output->menu_srl)

5
modules/install/install.controller.php
View file

@ -175,13 +175,14 @@ class installController extends install
if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
// load script
$scripts = FileHandler::readDir('./modules/install/script','/(\.php)$/');
$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
if(count($scripts)>0)
{
sort($scripts);
foreach($scripts as $script)
{
$output = include(FileHandler::getRealPath('./modules/install/script/'.$script));
$script_path = FileHandler::getRealPath('./modules/install/script/');
$output = include($script_path . $script));
}
}

2
modules/install/script/ko.install.php
View file

@ -114,7 +114,7 @@ $obj->module_srl = $module_srl;
Context::set('version', __XE_VERSION__);
$obj->title = 'Welcome XE';
$obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang);
$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang);
$output = $oDocumentController->insertDocument($obj);
if(!$output->toBool()) return $output;