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, 40 insertions, 38 deletions

diff --git a/mod/htmlawed/tests/tags.php b/mod/htmlawed/tests/tags.php
index b3914a9d6..05fe829f4 100644
--- a/mod/htmlawed/tests/tags.php
+++ b/mod/htmlawed/tests/tags.php
@@ -1,45 +1,47 @@
 <?php
+
 /**
  * Dupplicated tags in htmlawed
  */
 class HtmLawedDuplicateTagsTest extends ElggCoreUnitTest {
 
-    /**
-     * Called before each test object.
-     */
-    public function __construct() {
-        parent::__construct();
-    }
-    
-    /**
-     * Called before each test method.
-     */
-    public function setUp() {
-    }
-    
-    /**
-     * Called after each test method.
-     */
-    public function tearDown() {
-        // do not allow SimpleTest to interpret Elgg notices as exceptions
-        $this->swallowErrors();
-    }
-    
-    /**
-     * Called after each test object.
-     */
-    public function __destruct() {
-        elgg_set_ignore_access($this->ia);
-        // all __destruct() code should go above here
-        parent::__destruct();
-    }
-    
-    public function testNotDuplicateTags() {
-        $filter_html = '<ul><li>item</li></ul>';    
-        set_input('test', $filter_html);
-        
-        $expected = $filter_html;
-        $result = get_input('test');
-        $this->assertEqual($result, $expected);
-    }
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		// all __destruct() code should go above here
+		parent::__destruct();
+	}
+
+	public function testNotDuplicateTags() {
+		$filter_html = '<ul><li>item</li></ul>';
+		set_input('test', $filter_html);
+
+		$expected = $filter_html;
+		$result = get_input('test');
+		$this->assertEqual($result, $expected);
+	}
+
 }
\ No newline at end of file