Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop

1.8.18

Conflicts:
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js

1 files changed, 19 insertions, 19 deletions

diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
index a57edc2e2..1da6a1fd9 100644
--- a/mod/developers/views/default/theme_preview/navigation/page.php
+++ b/mod/developers/views/default/theme_preview/navigation/page.php
@@ -1,20 +1,20 @@
-<?php

-

-$params = array();

-$params['menu'] = array();

-$params['menu']['default'] = array();

-for ($i=1; $i<=5; $i++) {

-	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");

-}

-$params['menu']['default'][2]->setSelected(true);

-

-$m = new ElggMenuItem(10, "Child", "#");

-$m->setParent($params['menu']['default'][1]);

-$params['menu']['default'][1]->addChild($m);

-?>

-

-<div class="elgg-sidebar">

-<?php 

-	echo elgg_view('navigation/menu/page', $params);

-?>

+<?php
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+$m = new ElggMenuItem(10, "Child", "#");
+$m->setParent($params['menu']['default'][1]);
+$params['menu']['default'][1]->addChild($m);
+?>
+
+<div class="elgg-sidebar">
+<?php 
+	echo elgg_view('navigation/menu/page', $params);
+?>
 </div>
\ No newline at end of file