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

Merge branch 'release/1.7.8' into develop

Browse source 
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/admin/admin.admin.model.php
View file

@ -947,7 +947,6 @@ class adminAdminModel extends admin
function iconUrlCheck($iconname, $default_icon_name)
{
$site_info = Context::get('site_module_info');
$virtual_site = '';
if($site_info->site_srl)
@ -962,7 +961,8 @@ class adminAdminModel extends admin
}
else
{
$icon_url = $db_info->default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
$default_url = Context::getDefaultUrl();
$icon_url = $default_url . 'files/attach/xeicon/' . $virtual_site . $iconname;
}
return $icon_url;
}