Merge tag '1.8.14' of git://github.com/Elgg/Elgg into foxglove-3

Elgg 1.8.14

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/components/list.php b/mod/developers/views/default/theme_preview/components/list.php
index 8096bda04..fcb6f768a 100644
--- a/mod/developers/views/default/theme_preview/components/list.php
+++ b/mod/developers/views/default/theme_preview/components/list.php
@@ -1,19 +1,19 @@
-<?php

-

-$obj1 = new ElggObject();

-$obj1->title = "Object 1";

-$obj1->description = $ipsum;

-

-$obj2 = new ElggObject();

-$obj2->title = "Object 2";

-$obj2->description = $ipsum;

-

-$obj3 = new ElggObject();

-$obj3->title = "Object 3";

-$obj3->description = $ipsum;

-

-$obj4 = new ElggObject();

-$obj4->title = "Object 4";

-$obj4->description = $ipsum;

-

-echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));

+<?php
+
+$obj1 = new ElggObject();
+$obj1->title = "Object 1";
+$obj1->description = $ipsum;
+
+$obj2 = new ElggObject();
+$obj2->title = "Object 2";
+$obj2->description = $ipsum;
+
+$obj3 = new ElggObject();
+$obj3->title = "Object 3";
+$obj3->description = $ipsum;
+
+$obj4 = new ElggObject();
+$obj4->title = "Object 4";
+$obj4->description = $ipsum;
+
+echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));