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

@ -19,12 +19,6 @@
</script>
<div class="content">
<!--@if($logged_info->is_admin == 'Y')-->
<p class="path">
<a href="{getUrl('','module','admin')}">{$lang->control_panel}</a>
&gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$act)}">{$lang->env_setup}</a>
</p>
<!--@end-->
<h4 class="xeAdmin">{$lang->cmd_setup}</h4>