aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 22:29:07 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 22:29:07 +0000
commit92cfe78f70407552bc3128640d28c2f969b28161 (patch)
tree50a247ef31603b783cfd89cf766421642a6e97ef /engine
parenta4898df06bf1df35a309535b2fe953b23e1d0ca9 (diff)
downloadelgg-92cfe78f70407552bc3128640d28c2f969b28161.tar.gz
elgg-92cfe78f70407552bc3128640d28c2f969b28161.tar.bz2
moved admin messages into admin page shell
git-svn-id: http://code.elgg.org/elgg/trunk@8498 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/admin.php17
1 files changed, 2 insertions, 15 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 0ea029cdc..1e4b63cdd 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -280,14 +280,12 @@ function admin_pagesetup() {
* @return void
*/
function admin_settings_page_handler($page) {
- global $CONFIG;
admin_gatekeeper();
elgg_admin_add_plugin_settings_menu();
elgg_set_context('admin');
elgg_unregister_css('elgg');
-
$url = elgg_get_simplecache_url('js', 'admin');
elgg_register_js($url, 'admin');
@@ -313,9 +311,7 @@ function admin_settings_page_handler($page) {
$view = 'admin/plugin_settings';
$plugin = elgg_get_plugin_from_id($page[1]);
$vars['plugin'] = $plugin;
-
- // @todo ???
- $title = elgg_echo("admin:plugin_settings:{$page[1]}");
+
$title = elgg_echo("admin:{$page[0]}");
} else {
$view = 'admin/' . implode('/', $page);
@@ -325,21 +321,12 @@ function admin_settings_page_handler($page) {
}
}
- // allow a place to store helper views outside of the web-accessible views
+ // gets content and prevents direct access to 'components' views
if ($page[0] == 'components' || !($content = elgg_view($view, $vars))) {
$title = elgg_echo('admin:unknown_section');
$content = elgg_echo('admin:unknown_section');
}
- $notices_html = '';
- if ($notices = elgg_get_admin_notices()) {
- foreach ($notices as $notice) {
- $notices_html .= elgg_view_entity($notice);
- }
-
- $content = "<div class=\"admin_notices\">$notices_html</div>$content";
- }
-
$body = elgg_view_layout('admin', array('content' => $content, 'title' => $title));
echo elgg_view_page($title, $body, 'admin');
}