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

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-03-03 17:07:11 +09:00
commit d139cf5d87
8 changed files with 4744 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,6 +71,12 @@ class installAdminController extends install
$default_url = Context::get('default_url');
if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
if($default_url && substr($default_url, -1) !== '/') $default_url = $default_url.'/';
/* convert NON Alphabet URL to punycode URL - Alphabet URL will not be changed */
require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
$IDN = new idna_convert(array('idn_version' => 2008));
$default_url = $IDN->encode($default_url);
$use_ssl = Context::get('use_ssl');
if(!$use_ssl) $use_ssl = 'none';