Merge branch 'master' of github.com:Elgg/Elgg

5 files changed, 16 insertions, 24 deletions

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index d0e7915cc..2b2ec9e4a 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -55,16 +55,7 @@ if ($notices) {
 			</div>
 		</div>
 	</div>
-<?php
-
-echo elgg_view('footer/analytics');
-$js = elgg_get_loaded_js('footer');
-foreach ($js as $script) { ?>
-	<script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-?>
+	<?php echo elgg_view('page/elements/foot'); ?>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/views/default/page/default.php b/views/default/page/default.php
index 77f79157b..9effce1ec 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -60,15 +60,6 @@ header("Content-type: text/html; charset=UTF-8");
 		</div>
 	</div>
 </div>
-<?php
-
-echo elgg_view('footer/analytics');
-$js = elgg_get_loaded_js('footer');
-foreach ($js as $script) { ?>
-	<script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-?>
+<?php echo elgg_view('page/elements/foot'); ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php
new file mode 100644
index 000000000..a56b373b4
--- /dev/null
+++ b/views/default/page/elements/foot.php
@@ -0,0 +1,11 @@
+<?php
+
+echo elgg_view('footer/analytics');
+
+$js = elgg_get_loaded_js('footer');
+foreach ($js as $script) { ?>
+	<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php
+}
+
+?>
\ No newline at end of file
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 5f9bf4798..048edec40 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -70,7 +70,6 @@ echo $feedref;
 
 $metatags = elgg_view('metatags', $vars);
 if ($metatags) {
-	elgg_deprecated_notice("The metatags view has been deprecated for html_head/extend", 1.8);
+	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
 	echo $metatags;
-}
-echo elgg_view('html_head/extend', $vars);
+}
\ No newline at end of file
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 662e90f45..95d17fcff 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -39,6 +39,6 @@ $title = $site->name;
 		<div id="elgg-walledgarden-bottom"></div>
 	</div>
 </div>
-<?php echo elgg_view('footer/analytics'); ?>
+<?php echo elgg_view('page/elements/foot'); ?>
 </body>
 </html>
\ No newline at end of file