Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.8 release

Conflicts:
	js/lib/languages.js

1 files changed, 12 insertions, 0 deletions

diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index 48625f456..6aba837e0 100644
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -33,3 +33,15 @@ function tinymce_longtext_menu($hook, $type, $items, $vars) {
 	
 	return $items;
 }
+
+function tinymce_get_site_language() {
+
+	if ($site_language = elgg_get_config('language')) {
+		$path = elgg_get_plugins_path() . "tinymce/vendor/tinymce/jscripts/tiny_mce/langs";
+		if (file_exists("$path/$site_language.js")) {
+			return $site_language;
+		}
+	}
+
+	return 'en';
+}