diff options
| -rw-r--r-- | engine/lib/views.php | 6 | ||||
| -rw-r--r-- | mod/embed/start.php | 2 | ||||
| -rw-r--r-- | mod/profile/start.php | 2 | ||||
| -rw-r--r-- | views/default/js/elgg.php (renamed from views/default/js/initialise_elgg.php) | 12 |
4 files changed, 15 insertions, 7 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php index fa65bcae8..ade5ff678 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1471,8 +1471,8 @@ function elgg_invalidate_simplecache() { * Add the core Elgg head elements that could be cached */ function elgg_views_register_core_head_elements() { - $url = elgg_view_get_simplecache_url('js', 'initialise_elgg'); - elgg_register_js($url, 'initialise_elgg'); + $url = elgg_view_get_simplecache_url('js', 'elgg'); + elgg_register_js($url, 'elgg'); $url = elgg_view_get_simplecache_url('css', 'screen'); elgg_register_css($url, 'screen'); @@ -1493,7 +1493,7 @@ function elgg_views_boot() { elgg_view_register_simplecache('css/ie'); elgg_view_register_simplecache('css/ie6'); elgg_view_register_simplecache('js/friendsPickerv1'); - elgg_view_register_simplecache('js/initialise_elgg'); + elgg_view_register_simplecache('js/elgg'); $base = elgg_get_site_url(); elgg_register_js("{$base}vendors/jquery/jquery-1.4.2.min.js", 'jquery'); diff --git a/mod/embed/start.php b/mod/embed/start.php index 5f8b76641..8ad1a6178 100644 --- a/mod/embed/start.php +++ b/mod/embed/start.php @@ -11,7 +11,7 @@ */ function embed_init() { elgg_extend_view('css/screen', 'embed/css'); - elgg_extend_view('js/initialise_elgg', 'embed/js'); + elgg_extend_view('js/elgg', 'embed/js'); elgg_extend_view('html_head/extend', 'embed/metatags'); elgg_extend_view('input/longtext', 'embed/link', 1); diff --git a/mod/profile/start.php b/mod/profile/start.php index 5e581a308..4c24c2b50 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -40,7 +40,7 @@ function profile_init() { // Add Javascript reference to the page header elgg_extend_view('html_head/extend', 'profile/metatags'); elgg_extend_view('css/screen', 'profile/css'); - elgg_extend_view('js/initialise_elgg', 'profile/javascript'); + elgg_extend_view('js/elgg', 'profile/javascript'); // Now override icons elgg_register_plugin_hook_handler('entity:icon:url', 'user', 'profile_usericon_hook'); diff --git a/views/default/js/initialise_elgg.php b/views/default/js/elgg.php index 2db51d991..fdf9aa858 100644 --- a/views/default/js/initialise_elgg.php +++ b/views/default/js/elgg.php @@ -1,6 +1,6 @@ <?php /** - * Bootstrap Elgg javascript + * Core Elgg javascript loader */ global $CONFIG; @@ -321,4 +321,12 @@ this.each(function() { }); -};
\ No newline at end of file +}; + +<?php + +$previous_content = elgg_view('js/initialise_elgg'); +if ($previous_content) { + elgg_deprecated_notice("The view 'js/initialise_elgg' has been deprecated for js/elgg", 1.8); + echo $previous_content; +} |