diff options
| author | Sem <sembrestels@riseup.net> | 2013-08-22 23:38:47 -0400 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-08-22 23:38:47 -0400 |
| commit | f24e08416c793428ba863840e7d5e502e6d68cfc (patch) | |
| tree | d7797c71630ec90fbea310f588a432ac0d39b597 /views/default/page/elements/foot.php | |
| parent | 88733a24caee170acda071281eb4630bf5ef5794 (diff) | |
| parent | 46c365abd6e190a5c389b0dd49b02cd6e878ccd9 (diff) | |
| download | elgg-f24e08416c793428ba863840e7d5e502e6d68cfc.tar.gz elgg-f24e08416c793428ba863840e7d5e502e6d68cfc.tar.bz2 | |
Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8
Conflicts:
views/default/page/elements/foot.php
views/default/page/elements/owner_block.php
Diffstat (limited to 'views/default/page/elements/foot.php')
| -rw-r--r-- | views/default/page/elements/foot.php | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php deleted file mode 100644 index 6736fe3ab..000000000 --- a/views/default/page/elements/foot.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * @override views/default/page/elements/foot.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 |