aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-23 22:23:19 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-23 22:23:19 +0000
commit84ba687ada81314480bbcd0f0c1883bfcaac3f20 (patch)
treea9b0ed83c012bbd0517ba209fd474a6bbe3f9c5e
parent4ba95f6d9b85746a5fdae7e9847f096d7d223f02 (diff)
downloadelgg-84ba687ada81314480bbcd0f0c1883bfcaac3f20.tar.gz
elgg-84ba687ada81314480bbcd0f0c1883bfcaac3f20.tar.bz2
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
-rw-r--r--mod/embed/start.php2
-rw-r--r--mod/pages/start.php4
-rw-r--r--mod/profile/start.php2
-rw-r--r--mod/sitepages/start.php2
-rw-r--r--views/default/page_elements/html_begin.php8
5 files changed, 12 insertions, 6 deletions
diff --git a/mod/embed/start.php b/mod/embed/start.php
index 5a7076c34..4eb5fcec2 100644
--- 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 787f0c632..9d196d867 100644
--- 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 1ba2e6dc5..c8a83077c 100644
--- 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 b98345451..2960bd6a5 100644
--- 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 ebd4c008a..68607f1ec 100644
--- 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>