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, 11 insertions, 0 deletions

diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js
index 2a676e22a..bd39e7fb3 100644
--- a/js/tests/ElggLibTest.js
+++ b/js/tests/ElggLibTest.js
@@ -78,6 +78,7 @@ ElggLibTest.prototype.testNormalizeUrl = function() {
 		['https://example.com', 'https://example.com'],
 		['http://example-time.com', 'http://example-time.com'],
 		['//example.com', '//example.com'],
+		['mod/my_plugin/graphics/image.jpg', elgg.config.wwwroot + 'mod/my_plugin/graphics/image.jpg'],
 
 		['ftp://example.com/file', 'ftp://example.com/file'],
 		['mailto:brett@elgg.org', 'mailto:brett@elgg.org'],
@@ -127,3 +128,13 @@ ElggLibTest.prototype.testParseUrl = function() {
 	});
 };
 
+ElggLibTest.prototype.testParseStr = function() {
+
+	[
+		["A+%2B+B=A+%2B+B", {"A + B": "A + B"}]
+
+	].forEach(function(args) {
+		assertEquals(args[1], elgg.parse_str(args[0]));
+	});
+};
+