Fixes #2270 - deprecates metatags view and replaces with html_head/extend

git-svn-id: http://code.elgg.org/elgg/trunk@7428 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/embed/start.php b/mod/embed/start.php
index 5a7076c34077b45ca346e7f9c9ea2edc0c494a58..4eb5fcec209594eb55a5035e41f0688c4c43aa34 100644 (file)
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -12,7 +12,7 @@
 function embed_init() {
        elgg_extend_view('css', 'embed/css');
        elgg_extend_view('js/initialise_elgg', 'embed/js');
-       elgg_extend_view('metatags', 'embed/metatags');
+       elgg_extend_view('html_head/extend', 'embed/metatags');
        elgg_extend_view('input/longtext', 'embed/link', 1);
 
        // Page handler for the modal media embed

diff --git a/mod/pages/start.php b/mod/pages/start.php
index 787f0c632ce1df88b53c241e9d306561e529336d..9d196d867bf924034edc6bc8799791155b734b99 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -146,7 +146,7 @@ function pages_page_handler($page) {
                                        set_input('page_guid', $page[1]);
                                }
 
-                               elgg_extend_view('metatags','pages/metatags');
+                               elgg_extend_view('html_head/extend','pages/metatags');
 
                                $entity = get_entity($page[1]);
                                //add_submenu_item(elgg_echo('pages:label:view'), "pg/pages/view/{$page[1]}", 'pageslinks');
@@ -164,7 +164,7 @@ function pages_page_handler($page) {
                                        set_input('page_guid', $page[1]);
                                }
 
-                               elgg_extend_view('metatags','pages/metatags');
+                               elgg_extend_view('html_head/extend','pages/metatags');
 
                                $entity = get_entity($page[1]);
                                add_submenu_item(elgg_echo('pages:label:view'), "pg/pages/view/{$page[1]}", 'pageslinks');

diff --git a/mod/profile/start.php b/mod/profile/start.php
index 1ba2e6dc5f3ea6833801485affcf1f48d49348b1..c8a83077c49dbe723a6f469706a5d4adeff25e38 100644 (file)
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -40,7 +40,7 @@ function profile_init() {
        register_page_handler('iconjs', 'profile_iconjs_handler');
 
        // Add Javascript reference to the page header
-       elgg_extend_view('metatags', 'profile/metatags');
+       elgg_extend_view('html_head/extend', 'profile/metatags');
        elgg_extend_view('css', 'profile/css');
        elgg_extend_view('js/initialise_elgg', 'profile/javascript');
 

diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index b983454517c163f562b139c166415ff0527ed3ff..2960bd6a53af3fe2e87a2ebe9bf05cd9dc02be3c 100644 (file)
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -35,7 +35,7 @@ function sitepages_init() {
        register_entity_url_handler('sitepages_url', 'object', 'sitepages');
 
        elgg_extend_view('footer/links', 'sitepages/footer_menu');
-       elgg_extend_view('metatags', 'sitepages/metatags');
+       elgg_extend_view('html_head/extend', 'sitepages/metatags');
 
        // Replace the default index page if user has requested and the site is not running walled garden
        if (get_plugin_setting('ownfrontpage', 'sitepages') == 'yes') {

diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php
index ebd4c008a5a770f44824df986110e3f93a11f474..68607f1ecbef003346db4978af36518a7bbbb7fd 100644 (file)
--- a/views/default/page_elements/html_begin.php
+++ b/views/default/page_elements/html_begin.php
@@ -77,7 +77,13 @@ foreach ($css as $link) {
 
 echo elgg_view('scripts/initialize_elgg');
 echo $feedref;
-echo elgg_view('metatags', $vars);
+
+$metatags = elgg_view('metatags', $vars);
+if ($metatags) {
+       elgg_deprecated_notice("The metatags view has been deprecated for html_head/extend", 1.8);
+       echo $metatags;
+}
+echo elgg_view('html_head/extend', $vars);
 ?>
 </head>