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

merger from branch luminous (~r11576)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-10-04 05:04:23 +00:00
commit 51bb8d1985
91 changed files with 1157 additions and 703 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/menu/menu.admin.view.php
View file

@ -233,7 +233,7 @@
function _menuInfoSetting(&$menu)
{
$oModuleModel = &getModel('module');
if(!preg_match('/^http/i', $menu['url']))
if($menu['url'] && !preg_match('/^http/i', $menu['url']))
{
unset($midInfo);
unset($moduleInfo);