fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +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:
akasima 2014-04-15 14:41:24 +09:00
commit 78316f7da5
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/menu/menu.admin.model.php
View file

@ -349,6 +349,7 @@ class menuAdminModel extends menu
foreach($_allModules as $module_name)
{
$module = $oModuleModel->getModuleInfoXml($module_name);
if(!isset($module)) continue;
$defaultSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'P');
$defaultMobileSkin = $oModuleModel->getModuleDefaultSkin($module_name, 'M');
$skinInfo = $oModuleModel->loadSkinInfo(ModuleHandler::getModulePath($module_name), $defaultSkin);

1
modules/point/point.controller.php
View file

@ -152,6 +152,7 @@ class pointController extends point
// If there are comment points, attempt to deduct
if($comment_point>0) return new Object();
// Get all the comments related to this post
$cp_args = new stdClass();
$cp_args->document_srl = $document_srl;
$output = executeQueryArray('point.getCommentUsers', $cp_args);
// Return if there is no object