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

Misc fixes to install module

Browse source
This commit is contained in:
Kijin Sung 2016-02-07 22:55:52 +09:00
parent bb888a5037
commit e59dc59664
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,10 +161,11 @@ class installController extends install
$config['locale']['default_lang'] = Context::getLangType(); $config['locale']['default_lang'] = Context::getLangType();
$config['locale']['enabled_lang'] = array($config['locale']['default_lang']); $config['locale']['enabled_lang'] = array($config['locale']['default_lang']);
// Set the internal and default time zones. // Set the default time zone.
if (strpos($time_zone, '/') !== false) if (strpos($time_zone, '/') !== false)
{ {
$config['locale']['default_timezone'] = $time_zone; $config['locale']['default_timezone'] = $time_zone;
$user_timezone = null;
} }
else else
{ {
@ -179,7 +180,20 @@ class installController extends install
$config['locale']['default_timezone'] = 'Etc/GMT' . ($user_timezone > 0 ? '-' : '+') . abs($user_timezone); $config['locale']['default_timezone'] = 'Etc/GMT' . ($user_timezone > 0 ? '-' : '+') . abs($user_timezone);
} }
} }
$config['locale']['internal_timezone'] = intval(date('Z'));
// Set the internal time zone.
if ($config['locale']['default_timezone'] === 'Asia/Seoul')
{
$config['locale']['internal_timezone'] = 32400;
}
elseif ($user_timezone !== null)
{
$config['locale']['internal_timezone'] = $user_timezone * 3600;
}
else
{
$config['locale']['internal_timezone'] = 0;
}
// Set the default URL. // Set the default URL.
$config['url']['default'] = Context::getRequestUri(); $config['url']['default'] = Context::getRequestUri();

1
modules/install/tpl/js/install.js
View file

@ -41,6 +41,7 @@ jQuery(function($){
$("#task-complete-install").click(function() { $("#task-complete-install").click(function() {
$("#task-complete-install").text($("#task-complete-install").data("installing")); $("#task-complete-install").text($("#task-complete-install").data("installing"));
$("#task-complete-install").prop("disabled", true); $("#task-complete-install").prop("disabled", true);
$(window).on("beforeunload", function() { return ""; });
}); });
} }
}); });