Views in the js/ directory should not contain <script> tags

git-svn-id: http://code.elgg.org/elgg/trunk@8238 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
index b967a0914542fc5b442f5f7a46ed8e0f8d64f272..9032d8a63d316b83845117b807df8375582ee695 100644 (file)
--- a/views/default/js/initialize_elgg.php
+++ b/views/default/js/initialize_elgg.php
@@ -4,7 +4,6 @@
  */
 
 ?>
-<script type="text/javascript">
 /**
  * Don't want to cache these -- they could change for every request
  */
@@ -41,5 +40,4 @@ if ($user instanceof ElggUser) {
        
        echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; 
 }
-?>;
-</script>
\ No newline at end of file
+?>

diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 5772d0d2413de9b37c94143a464f46c074e033c1..43a5fbd5407af0047d55e03bb3c6a4d948e4e553 100644 (file)
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -42,15 +42,13 @@ $release = get_version(true);
        <title><?php echo $title; ?></title>
        <link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
 
-<?php
-foreach ($css as $link) {
-?>
+<?php foreach ($css as $link) { ?>
        <link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
-<?php
-}
+<?php } ?>
 
-$ie_url = elgg_view_get_simplecache_url('css', 'ie');
-$ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
+<?php
+       $ie_url = elgg_view_get_simplecache_url('css', 'ie');
+       $ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
 ?>
        <!--[if gt IE 6]>
                <link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
@@ -59,14 +57,15 @@ $ie6_url = elgg_view_get_simplecache_url('css', 'ie6');
                <link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
        <![endif]-->
 
-<?php
-foreach ($js as $script) {
-?>
+<?php foreach ($js as $script) { ?>
        <script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
+<?php } ?>
 
-echo elgg_view('js/initialize_elgg');
+<script type="text/javascript">
+       <?php echo elgg_view('js/initialize_elgg'); ?>
+</script>
+
+<?php
 echo $feedref;
 
 $metatags = elgg_view('metatags', $vars);