From 0d8515deb750fe2a02ee6f9f12860caceed7248f Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 3 Nov 2009 06:47:23 +0000
Subject: #552478 by pwolanin, samj, dropcube, and sun: Improve link/header API
 and support on node/comment pages rel=canonical and rel=shortlink standards.

---
 modules/system/system.module | 46 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

(limited to 'modules/system/system.module')

diff --git a/modules/system/system.module b/modules/system/system.module
index 0b587db77..da1089b92 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -179,12 +179,6 @@ function system_theme() {
     'system_powered_by' => array(
       'variables' => array(),
     ),
-    'meta_generator_html' => array(
-      'variables' => array('version' => NULL),
-    ),
-    'meta_generator_header' => array(
-      'variables' => array('version' => NULL),
-    ),
     'system_compact_link' => array(
       'variables' => array(),
     ),
@@ -318,6 +312,12 @@ function system_element_info() {
     '#ajax_commands' => array(),
   );
 
+  $types['html_tag'] = array(
+    '#theme' => 'html_tag',
+    '#attributes' => array(),
+    '#value' => NULL,
+  );
+
   // Input elements.
   $types['submit'] = array(
     '#input' => TRUE,
@@ -1717,22 +1717,6 @@ function system_init() {
   }
 }
 
-/**
- * Implement MODULE_preprocess_HOOK().
- */
-function system_preprocess_page(&$variables) {
-  // Get the major version
-  list($version, ) = explode('.', VERSION);
-
-  // Emit the META tag in the HTML HEAD section
-  theme('meta_generator_html', array('version' => $version));
-
-  // Emit the HTTP Header too
-  theme('meta_generator_header', array('version' => $version));
-
-  $variables['head'] = drupal_get_html_head();
-}
-
 /**
  * Implement hook_form_FORM_ID_alter().
  */
@@ -2973,24 +2957,6 @@ function theme_system_compact_link() {
   return $output;
 }
 
-/**
- * Send Drupal and the major version number in the META GENERATOR HTML.
- *
- * @ingroup themeable
- */
-function theme_meta_generator_html($variables) {
-  drupal_add_html_head('<meta name="Generator" content="Drupal ' . $variables['version'] . ' (http://drupal.org)" />');
-}
-
-/**
- * Send Drupal and the major version number in the HTTP headers.
- *
- * @ingroup themeable
- */
-function theme_meta_generator_header($variables) {
-  drupal_add_http_header('X-Generator', 'Drupal ' . $variables['version'] . ' (http://drupal.org)');
-}
-
 /**
  * Implement hook_image_toolkits().
  */
-- 
cgit v1.2.3