merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -8,7 +8,7 @@ class menuMobile extends moduleObject {
if(!$menu_item['link']) return;
$obj->href = $menu_item['href'];
$obj->depth = $depth;
$obj->link = $menu_item['link'];
$obj->text = $menu_item['text'];
$this->result[] = $obj;
if(!$menu_item['list']) return;
foreach($menu_item['list'] as $item)