merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -1,8 +1,23 @@
<?php
/**
* menuMobile class
* mobile class of the menu module
*
* @author NHN (developers@xpressengine.com)
* @package /modules/menu
* @version 0.1
*/
class menuMobile extends moduleObject {
/**
* Result data list
* @var array
*/
var $result = array();
/**
* Menu depth arrange
* @return void
*/
function straightenMenu($menu_item, $depth)
{
if(!$menu_item['link']) return;
@ -17,6 +32,10 @@ class menuMobile extends moduleObject {
}
}
/**
* Display menu
* @return void
*/
function dispMenuMenu() {
$menu_srl = Context::get('menu_srl');
$oAdminModel =& getAdminModel('menu');