diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 0dc4a2cb5..1d6bcb51d 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -274,7 +274,6 @@ foreach($output AS $key=>$value) { $value->content = strip_tags($value->content); - if(!trim($value->content)) $value->content = '...'; } } Context::set('latestCommentList', $output); diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php index 1dfd09f23..d7010cbb0 100644 --- a/modules/admin/admin.class.php +++ b/modules/admin/admin.class.php @@ -119,46 +119,50 @@ 'subMenu'=>array('importer'), ), 10=>array( + 'module'=>'trash', + 'subMenu'=>array('trash'), + ), + 11=>array( 'module'=>'admin', 'subMenu'=>array('theme'), ), - 11=>array( + 12=>array( 'module'=>'autoinstall', 'subMenu'=>array('easyInstall'), ), - 12=>array( + 13=>array( 'module'=>'layout', 'subMenu'=>array('installedLayout'), ), - 13=>array( + 14=>array( 'module'=>'module', 'subMenu'=>array('installedModule'), ), - 14=>array( + 15=>array( 'module'=>'widget', 'subMenu'=>array('installedWidget'), ), - 15=>array( + 16=>array( 'module'=>'addon', 'subMenu'=>array('installedAddon'), ), - 16=>array( + 17=>array( 'module'=>'editor', 'subMenu'=>array('editor'), ), - 17=>array( + 18=>array( 'module'=>'spamfilter', 'subMenu'=>array('spamFilter'), ), - 18=>array( + 19=>array( 'module'=>'admin', 'subMenu'=>array('adminConfiguration', 'adminMenuSetup'), ), - 19=>array( + 20=>array( 'module'=>'file', 'subMenu'=>array('fileUpload'), ), - 20=>array( + 21=>array( 'module'=>'module', 'subMenu'=>array('filebox'), ), @@ -222,6 +226,7 @@ case 'rss': case 'multilingual': case 'importer': + case 'trash': return 'content'; break; case 'theme': diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index c87862011..09acbe2b4 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -65,7 +65,7 @@