4 files changed, 9 insertions, 11 deletions
diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index 7d0449096..a6d6bf6e1 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -32,7 +32,7 @@ header("Content-type: text/html; charset=UTF-8");
 
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<?php echo get_current_language(); ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -63,4 +63,4 @@ header("Content-type: text/html; charset=UTF-8");
 	<?php echo elgg_view('page/elements/foot'); ?>
 </body>
 
-</html>
-\ No newline at end of file
+</html>
diff --git a/views/default/page/default.php b/views/default/page/default.php
index f75fa1908..a0e6d4037 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -35,7 +35,7 @@ header("Content-type: text/html; charset=UTF-8");
 
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<?php echo get_current_language(); ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -71,4 +71,4 @@ header("Content-type: text/html; charset=UTF-8");
 </div>
 <?php echo elgg_view('page/elements/foot'); ?>
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index b1556b547..e7951c4ff 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -14,7 +14,7 @@ if (empty($vars['title'])) {
 
 global $autofeed;
 if (isset($autofeed) && $autofeed == true) {
-	$url = full_url();
+	$url = current_page_url();
 	if (substr_count($url,'?')) {
 		$url .= "&view=rss";
 	} else {
@@ -33,12 +33,10 @@ END;
 $js = elgg_get_loaded_js('head');
 $css = elgg_get_loaded_css();
 
-$version = get_version();
 $release = get_version(true);
 ?>
 	<meta charset="utf-8" />
-	<meta name="ElggRelease" content="<?php echo $release; ?>" />
-	<meta name="ElggVersion" content="<?php echo $version; ?>" />
+	<meta name="generator" content="Elgg <?php echo $release; ?>" />
 	<title><?php echo $title; ?></title>
 	<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
 
@@ -76,4 +74,4 @@ $metatags = elgg_view('metatags', $vars);
 if ($metatags) {
 	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
 	echo $metatags;
-}
-\ No newline at end of file
+}
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index e1d57dac8..77c901d8c 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -9,7 +9,7 @@
 header("Content-type: text/html; charset=UTF-8");
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<?php echo get_current_language(); ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -24,4 +24,4 @@ header("Content-type: text/html; charset=UTF-8");
 </div>
 <?php echo elgg_view('page/elements/foot'); ?>
 </body>
-</html>
-\ No newline at end of file
+</html>