5 files changed, 34 insertions, 4 deletions
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 048edec40..8776f07a7 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -40,7 +40,7 @@ $release = get_version(true);
 	<meta name="ElggRelease" content="<?php echo $release; ?>" />
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
 	<title><?php echo $title; ?></title>
-	<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
+	<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
 
 <?php foreach ($css as $link) { ?>
 	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php
index 4295deaa4..7fe721c40 100644
--- a/views/default/page/elements/header_logo.php
+++ b/views/default/page/elements/header_logo.php
@@ -1,13 +1,15 @@
 <?php
 /**
  * Elgg header logo
- * The logo to display in elgg-header.
  */
 
 $site = elgg_get_site_entity();
 $site_name = $site->name;
+$site_url = elgg_get_site_url();
 ?>
 
 <h1>
-	<a class="elgg-heading-site" href="<?php echo elgg_get_site_url(); ?>"><?php echo $site_name; ?></a>
+	<a class="elgg-heading-site" href="<?php echo $site_url; ?>">
+		<?php echo $site_name; ?>
+	</a>
 </h1>
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index c525a38aa..fc7f0f6d2 100644
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -15,7 +15,7 @@ $owner = elgg_get_page_owner_entity();
 if ($owner instanceof ElggGroup ||
 	($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
 
-	$header = elgg_view_entity($owner, false);
+	$header = elgg_view_entity($owner, array('full_view' => false));
 
 	$body = elgg_view_menu('owner_block', array('entity' => $owner));
 
diff --git a/views/default/page/elements/shortcut_icon.php b/views/default/page/elements/shortcut_icon.php
new file mode 100644
index 000000000..12fe9c1f8
--- /dev/null
+++ b/views/default/page/elements/shortcut_icon.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Displays the default shortcut icon
+ */
+?>
+<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
+\ No newline at end of file
diff --git a/views/default/page/elements/wrapper.php b/views/default/page/elements/wrapper.php
new file mode 100644
index 000000000..61828832d
--- /dev/null
+++ b/views/default/page/elements/wrapper.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Deprecated content wrapper view from Elgg 1.5 through 1.7
+ *
+ * @uses $vars['body'] The content to display inside content wrapper
+ * @uses $vars['subclass'] Additional css class
+ */
+
+elgg_deprecated_notice("The 'page_elements/contentwrapper' has been deprecated", 1.8);
+?>
+
+<div class="contentWrapper<?php
+
+	if (isset($vars['subclass'])) {
+		echo ' ' . $vars['subclass'];
+	}
+
+?>">
+<?php
+	echo $vars['body'];
+?>
+</div>