aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/admin.php2
-rw-r--r--engine/lib/views.php2
-rw-r--r--engine/start.php3
3 files changed, 6 insertions, 1 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 0a2158d45..106e899f9 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -189,6 +189,8 @@ function admin_settings_page_handler($page) {
elgg_admin_add_plugin_settings_sidemenu();
elgg_set_context('admin');
+ elgg_unregister_css('screen');
+
// default to overview
if (!isset($page[0]) || empty($page[0])) {
$page = array('overview');
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 71922cb6c..f314a93af 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1537,7 +1537,7 @@ function elgg_views_boot() {
elgg_register_js("{$base}vendors/jquery/jquery-ui-1.7.2.min.js", 'jquery-ui');
elgg_register_js("{$base}vendors/jquery/jquery.form.js", 'jquery.form');
- elgg_register_event_handler('pagesetup', 'system', 'elgg_views_register_core_head_elements');
+ elgg_register_event_handler('ready', 'system', 'elgg_views_register_core_head_elements');
// discover the built-in view types
// @todo cache this
diff --git a/engine/start.php b/engine/start.php
index 646ddbf72..6fcc788bd 100644
--- a/engine/start.php
+++ b/engine/start.php
@@ -142,3 +142,6 @@ if (!defined('UPGRADING')) {
// needs to be set for links in html head
$CONFIG->lastcache = $lastcached;
}
+
+// System loaded and ready
+elgg_trigger_event('ready', 'system');